aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-08-04Do not add the "next" key to likes.json if there is no more itemsSergey Suprunenko
2019-08-04Merge branch 'patch-2' into 'develop'kaniini
2019-08-04Replace "impode" with "implode" forx0rz3q
2019-08-04Merge branch 'remove-longfox-emoji-set' into 'develop'kaniini
2019-08-04Remove longfox emoji setHakaba Hitoyo
2019-08-04Merge branch 'develop' into 'develop'kaniini
2019-08-04Fix some typos and rework a few lines in howto_mediaproxy.mdPierce McGoran
2019-08-04Update link in README.mdPierce McGoran
2019-08-03tasks: relay: add list taskAriadne Conill
2019-08-03Merge branch 'bugfix/password-reset-link-styling' into 'develop'kaniini
2019-08-03templates/layout/app.html.eex: Style anchorsHaelwenn (lanodan) Monnier
2019-08-03Merge branch 'patch-2' into 'develop'kaniini
2019-08-03RefactorThibaut Girka
2019-08-03Only add `preferredUsername` to service actor json when the underlying user a...Thibaut Girka
2019-08-03Merge branch 'admin-fixes' into 'develop'kaniini
2019-08-03Admin fixesAlexander Strizhakov
2019-08-03Merge branch 'fix/search-space-error' into 'develop'kaniini
2019-08-03Remove spaces from the domain searchSergey Suprunenko
2019-08-03Merge branch 'fix/with-reject-nil-clause' into 'develop'kaniini
2019-08-03Handle MRF rejections of incoming AP activitiesSergey Suprunenko
2019-08-03Merge branch 'official-docker-support' into 'develop'kaniini
2019-08-03Run mix formatAshlynn Anderson
2019-08-03Add preferredUsername to service actors so Mastodon can resolve themThibaut Girka
2019-08-03Add .dockerignoreAshlynn Anderson
2019-08-03Optimize DockerfileAshlynn Anderson
2019-08-03Create docker.exs and docker-entrypoint + round out DockerfileAshlynn Anderson
2019-08-03Basic working DockerfileAshlynn Anderson
2019-08-02Merge branch 'docfix/mix_task_options' into 'develop'Haelwenn
2019-08-02tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-atHaelwenn (lanodan) Monnier
2019-08-02Pleroma API: Add endpoint to get conversation statuses.lain
2019-08-02Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'feld
2019-08-02Fix/mediaproxy whitelist base urlfeld
2019-08-02Merge branch 'develop' into feature/digest-emailRoman Chvanikov
2019-08-02CommonAPI: Extend api with conversation replies.lain
2019-08-02Merge branch 'feature/hide-follows-remote' into 'develop'lain
2019-08-02Conversations: Add recipient list to conversation participation.lain
2019-08-01Merge branch 'fix/semver-violations' into 'develop'kaniini
2019-08-01nothinglain
2019-08-01Merge branch 'cleanup-tests' into 'develop'rinpatch
2019-08-01Fix Invalid SemVer version generationrinpatch
2019-08-01Clean up tests outputEgor Kislitsyn
2019-08-01Add configurable length limits for `User.bio` and `User.name`Egor Kislitsyn
2019-07-31Merge branch 'chore/changelog-update' into 'develop'kaniini
2019-07-31Add a changelog entry for disallowing locked accounts follows over OStatusrinpatch
2019-07-31Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'kaniini
2019-07-31Disallow following locked accounts over OStatusrinpatch
2019-07-31Merge branch 'test/web_common_api_utils' into 'develop'kaniini
2019-07-31test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_idMaksim
2019-07-31Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop'kaniini
2019-07-31ostatus: explicitly disallow protocol downgrade from activitypubAriadne Conill