aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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 .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-02Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'feld
2019-08-02Fix/mediaproxy whitelist base urlfeld
2019-08-02Merge branch 'feature/hide-follows-remote' into 'develop'lain
2019-08-01Merge branch 'fix/semver-violations' into 'develop'kaniini
2019-08-01Merge branch 'cleanup-tests' into 'develop'rinpatch
2019-08-01Fix Invalid SemVer version generationrinpatch
2019-08-01Clean up tests outputEgor 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
2019-07-31Add tests for counters being updated on followrinpatch
2019-07-31Merge branch 'test/twitter/util_controller' into 'develop'kaniini
2019-07-31tests for TwitterApi/UtilControllerMaksim
2019-07-31Fix credo issuesrinpatch
2019-07-31Merge branch 'develop' into feature/hide-follows-remoterinpatch
2019-07-30Merge branch 'admin-changes' into 'develop'kaniini
2019-07-30Admin changesAlexander Strizhakov
2019-07-29Merge branch 'security/remote-follow-commonapi' into 'develop'kaniini
2019-07-29twitter api: utils: rework do_remote_follow() to use CommonAPIAriadne Conill
2019-07-29Merge branch 'revert-83508418' into 'develop'kaniini
2019-07-29Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"kaniini
2019-07-29Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'Haelwenn
2019-07-29markdown: clean up html generated by earmarkAriadne Conill
2019-07-29Merge branch 'refactor/use-constants' into 'develop'lain
2019-07-29Merge branch 'mailer-enabled-nodeinfo' into 'develop'kaniini
2019-07-29Add `mailerEnabled` to the NodeInfo metadataEugenij
2019-07-29Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'kaniini
2019-07-29Redirect not logged-in users to the MastoFE login page on private instancesSergey Suprunenko
2019-07-29Merge branch 'tests/ostatus_controller' into 'develop'kaniini
2019-07-29added tests for OstatusControllerMaksim
2019-07-29constants: add as_public constant and use it everywhereAriadne Conill
2019-07-29mix: add ex_const dependencyAriadne Conill