summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-04-16activitypub: allow indirect messages from users being followed at a personal ...William Pitcock
2019-04-16Add extra_cookie_attrs to changelogHakurei Reimu
2019-04-16make Pleroma.Endpoint use extra_cookie_attrs in configHakurei Reimu
2019-04-16add extra_cookie_attrs option to configHakurei Reimu
2019-04-16Merge branch 'deps/bump-exdoc' into 'develop'rinpatch
2019-04-16Bump ex_docrinpatch
2019-04-16Add supervisord configurationDominik V. Salonen
2019-04-15Merge branch 'remove-footguns' into 'develop'rinpatch
2019-04-15Custom Emoji docs: Make it clear that config.exs is not for lewd.lain
2019-04-15Config.exs: Add big warning so that nobody ever edits it.lain
2019-04-15Merge branch 'fix/status-reblogged' into 'develop'lambda
2019-04-15Merge branch 'unfollow-oneself' into 'develop'lambda
2019-04-15Merge branch 'refactor/remove-inReplyToStatusId' into 'develop'lambda
2019-04-15Use User.get_cached_by*eugenijm
2019-04-15oopsrinpatch
2019-04-15Remove inReplyToStatusIdrinpatch
2019-04-15Handle follow/unfollow directed to themselveseugenijm
2019-04-14Merge branch 'bugfix/registration-email-pattern' into 'develop'rinpatch
2019-04-14Revert "Assert on the success of enqueue before returning"Sadposter
2019-04-14Assert on the success of enqueue before returningSadposter
2019-04-14Always return {atom, _} from try_send_confirmationSadposter
2019-04-14fix pattern match on user registrationSadposter
2019-04-14Assign reblogged in the Mastodon reblog status vieweugenijm
2019-04-14Merge branch 'docs/archlinux-odbc' into 'develop'kaniini
2019-04-13docs/installation/arch_linux_en.md: Remove useless ODBCHaelwenn (lanodan) Monnier
2019-04-13Merge branch 'docs/changelog' into 'develop'Haelwenn
2019-04-13Put an actual description of the vulnerability and add **Breaking:** to break...rinpatch
2019-04-13naming fixAlex S
2019-04-13Merge develop to 788-separate-email-addressesAlex S
2019-04-13fallback to the old behaviourAlex S
2019-04-13Add a changelogrinpatch
2019-04-12Merge branch 'improve-formatter' into 'develop'Haelwenn
2019-04-12Revert "simplify mentions escape"Egor
2019-04-12Merge branch 'bugfix/pleroma-email-naming' into 'develop'lambda
2019-04-12Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'lambda
2019-04-12Merge branch 'fix/732-password-align' into 'develop'lambda
2019-04-12Merge branch 'ssl_trusted_cert' into 'develop'lambda
2019-04-12Merge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop'kaniini
2019-04-12adding destroy multiple for mastofeAlexander Strizhakov
2019-04-12Merge branch 'bug/790-repeated-posts-that-are-replies-have-in-reply-to-id-nul...kaniini
2019-04-12in_reply_to_id - nullAlexander Strizhakov
2019-04-11Merge branch 'fix/hackney_max_body_param' into 'develop'kaniini
2019-04-12Add `with_body: true` to requests relying on `max_body: val`Roman Chvanikov
2019-04-11Merge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop'lambda
2019-04-11Update Mastodon Frontend to 2019-04-11 bundleHaelwenn (lanodan) Monnier
2019-04-10[#923] OAuth consumer params handling refactoring.Ivan Tashkinov
2019-04-10Merge branch 'develop' into feature/788-separate-email-addressesAlex S
2019-04-10adding notify_email setting for trigger emailsAlex S
2019-04-10Merge branch 'feature/767-multiple-use-invite-token' into 'develop'lambda
2019-04-10Merge branch 'feature/user-status-subscriptions' into 'develop'lambda