Morgan Bazalgette <the@howl.moe> committed rPUBE5ca70cbc5a1a: Bring mastofe up-to-date with commit 8d064c253644cba25c3b1eef424db6daa4a13471.

Mark Felder <feld@FreeBSd.org> committed rPUBE06de727da5d1: WIP: Plumb /about/more to the terms-of-service.html file for now.

Mark Felder <feld@FreeBSd.org> committed rPUBE74a5610cdf79: Just redirect. No error handling here makes sense..

Mark Felder <feld@FreeBSd.org> committed rPUBEa6c7084f4156: Actually compile and run test. It works :-).

Jeff Becker <jeff@i2p.rocks> committed rPUBE26177dbc77b2: i suck at elixir.

Jeff Becker <jeff@i2p.rocks> committed rPUBEdf443f2cd753: socks5 support.

Jeff Becker <jeff@i2p.rocks> committed rPUBE0b61aa7d5c3f: more sucking at elixir.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE56661c6d3f00: Merge remote-tracking branch 'upstream/develop' into develop.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE73c522246603: typo!.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE7ae1dd871bb8: regex now replaces \r\n and \n.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBEe469bcf31166: Further clean-up.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBEe81ff0e0367e: The only change with the develop branch should be the small patch to put.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE2e4292105e09: Branches for patches, not pixelbot.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBEf9196353fd3c: Forgot to add a file.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBEa491903e2c47: replaced nsfw with black.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBEf9ff52b63009: nm.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE0fd51321d9d5: Don't post canvas if no changes.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBEcad0c728b5d9: Less logging, fewer warnings, updated web page.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE94aaa49a97c2: Merge remote-tracking branch 'upstream/develop' into develop.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE84f97a49b3c2: Added instance description.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE8bbfbf800e24: Path to png generator is now relative.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE00de38f9bba9: Updated the web page.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBEbe8a7fdd5847: Substitute \r\n for <br> in bio.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE12687781cad5: Pixelbot now replies!.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE3241738a6c0f: Back-up of a "default" canvas.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE9623ff958d7e: Merge remote-tracking branch 'upstream/develop' into develop.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE597852ad6d58: Scripts to keep things in sync.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE8123cce9a447: Merge remote-tracking branch 'upstream/develop' into develop.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE23a69509a694: Flipped X and Y in create_png and made msg parsing more robust..

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE2913ee2ae329: This is up-to-date with Pleroma devel 2018-03-31 and it has my pixelbot.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE6985ae01ef72: Some fixes, removed hardcoded paths, support compact format, restore.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBEe5874c3c9502: Added favicon.

Andrew Zah <zah@andrewzah.com> committed rPUBEc78900b9920f: Add mix tasks for setting admin/removing staff.

Nick Thomas <me@ur.gs> committed rPUBE72b4c91f6ae4: Remove Mix.env() from code in lib/.

Andrew Zah <zah@andrewzah.com> committed rPUBE5b6ecbf2e20b: Add about_enabled option in config.

href <href@random.sh> committed rPUBE7b350fa7eadd: Expose private in statusnet, nodeinfo & config FE via statusnet.

Andrew Zah <zah@andrewzah.com> committed rPUBEf9c92beb3e16: Update/add formatter specs.

href <href@random.sh> committed rPUBEf6b558b86300: Configure logo in :instance.

Andrew Zah <zah@andrewzah.com> committed rPUBEe03a02c9a17c: Add page controller, view, templates -> about/more.

Andrew Zah <zah@andrewzah.com> committed rPUBE88cbbef3dd7c: Don't downcase tags.

Francis Dinh <normandy@firemail.cc> committed rPUBEb0791492ebc6: Handle incoming unshares.

Francis Dinh <normandy@firemail.cc> committed rPUBEbefc5375effe: Fix typo.

href <href@random.sh> committed rPUBEefe893d6140d: Configurable instance description.

href <href@random.sh> committed rPUBE112a5333d912: Default instance description.

Francis Dinh <normandy@firemail.cc> committed rPUBE84b7227569a9: Add test for unshare over OStatus.

Francis Dinh <normandy@firemail.cc> committed rPUBE14bed3254377: Use to and cc of announce activity for mentions.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE1134717071cc: Added "visibility" => "public" to make the tests pass, and the description for….

Francis Dinh <normandy@firemail.cc> committed rPUBEe90b496617a7: Cleanup to_simple_form and add hander for undo announce.

Francis Dinh <normandy@firemail.cc> committed rPUBEf2a07091f62f: Add test.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE64b4fac6b2d8: OK, now the files are formatted ....

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE3b906ec605a9: Now formatted..

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBEbe20f6dbc467: Merge remote-tracking branch 'upstream/develop' into patch-add-image-description.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE59b391bfc95b: Merge remote-tracking branch 'upstream/develop' into patch-add-image-description.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE7819706590df: Merge remote-tracking branch 'upstream/develop' into patch-add-image-description.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBE028b7ad4d0da: Added support for alt text on POST /api/v1/media, modified the corresponding….

Haelwenn (lanodan) Monnier <contact@hacktivis.me> committed rPUBE10621d03d7bb: lib/pleroma/web/oauth/oauth_controller.ex: Have a wrapper for username to name.

href <href@random.sh> committed rPUBE7fe5e89d2eaa: config switch to disable idna.

Francis Dinh <normandy@firemail.cc> committed rPUBE1f03e1118f27: Bump reported Mastodon API version to 2.4.0.

som nom <som@nom.dynu.net> committed rPUBE8317a61e6fc3: Update README.md : no sudo needed for the psql setup part.

Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> committed rPUBEd9dc142822e6: Patch to support image decriptions in the Mastodon front-end.

Francis Dinh <normandy@firemail.cc> committed rPUBE6f33bde31e42: Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into….

href <href@random.sh> committed rPUBE1229ecb50a5f: idna support in get user.

href <href@random.sh> committed rPUBE430894407d7a: i should have a proper dev instance but too lazy.

href <href@random.sh> committed rPUBE1813f5e05ebf: fix & masto api.

Francis Dinh <normandy@firemail.cc> committed rPUBE26971a5e9b3f: Use correct verb for unfollow.

Francis Dinh <normandy@firemail.cc> committed rPUBE608f3855a9f9: Merge branch 'develop' into fix/ostatus-unfollow.

href <href@random.sh> committed rPUBEed3ba94303cc: more fix. i should think before writing code.

href <href@random.sh> committed rPUBE5801a5a455df: all hail the tail (mentions support).

href <href@random.sh> committed rPUBEe6e00794d337: first try at idna.

href <href@random.sh> committed rPUBE12fbccfea53d: fix html mentions.

Haelwenn (lanodan) Monnier <contact@hacktivis.me> committed rPUBE4f5e9e4ec490: lib/pleroma/web/mastodon_api/views/status_view.ex: More than 4 attachements.

href <href@random.sh> committed rPUBEd02762d6acde: Merge remote-tracking branch 'upstream/develop' into otp-release.

Rachel H <lastexyle@gmail.com> committed rPUBE38b412ee5828: pull in changes from frontend.

riking <rikingcoding@gmail.com> committed rPUBE7cfd483c4da1: fix /object/uuid for non-post Objects.

riking <rikingcoding@gmail.com> committed rPUBEe16ad45cff27: First draft of adding OpenGraph metadata to /notice/ pages.

riking <rikingcoding@gmail.com> committed rPUBEf10b4a109f0b: teach OStatusController how to respond with AP json.

csaurus <csaurus@mailbox.org> committed rPUBEf62f0fa78275: WIP: Strange error.

csaurus <csaurus@mailbox.org> committed rPUBE33f4fa0ccef2: Trying to make a session.

csaurus <csaurus@mailbox.org> committed rPUBE283e02691e8d: Merge branch 'develop' into test/streams.

Rachel H <lastexyle@gmail.com> committed rPUBE806f2bf48f65: Handle file uploads as files instead of strings.

href <href@random.sh> committed rPUBE8e8f2c9d3ace: Merge remote-tracking branch 'upstream/develop' into otp-release.

csaurus <csaurus@mailbox.org> committed rPUBEe7d24bfcabe1: "it sends direct messages" test.

href <href@random.sh> committed rPUBEb1be89207c9e: fix url.scheme again.

href <href@random.sh> committed rPUBEccc0d272ea93: add customized vm.args.

href <href@random.sh> committed rPUBEa65ed1231104: fix url scheme config.

href <href@random.sh> committed rPUBE5f29e58dfbfc: configure run_erl to log 5 files at 50mb.

href <href@random.sh> committed rPUBE549666150420: format.

href <href@random.sh> committed rPUBEba9f780fae62: that's it i've added the pre-commit hook.

href <href@random.sh> committed rPUBE7ef699135048: ci: fix artifact & only archive tarball.

href <href@random.sh> committed rPUBEafe2a7016c33: Keyword.get/3 default doesnt apply if its already nil.

href <href@random.sh> committed rPUBE7f5d3173a100: format..

href <href@random.sh> committed rPUBE8754e90d037a: Common CLI (Mix & Releases).

href <href@random.sh> committed rPUBE4cc06259923d: ecto adapter conf is compile-time.

href <href@random.sh> committed rPUBE654997400f42: fix endpoint config.

href <href@random.sh> committed rPUBE6240822a2786: config for MRF Simple.

href <href@random.sh> committed rPUBEb3ee574ab77a: Merge remote-tracking branch 'upstream/develop' into otp-release.

href <href@random.sh> committed rPUBE6751a1f2c03e: format.

href <href@random.sh> committed rPUBE8c0af2202275: re-order config.

href <href@random.sh> committed rPUBEdd2e76dcb57b: migrate hook & remove exrm, fixes.

href <href@random.sh> committed rPUBEbe429fe26221: config.