aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-04-20Digest emailsRoman Chvanikov
2019-04-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/dig...Roman Chvanikov
2019-04-19Fix testsRoman Chvanikov
2019-04-19Add User.list_inactive_users_query/1Roman Chvanikov
2019-04-19Add Notification.for_user_since/2Roman Chvanikov
2019-04-19Merge branch 'feature/805-server-rendered-rel-me-links' into 'develop'lambda
2019-04-19typo fixAlexander Strizhakov
2019-04-19Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'lambda
2019-04-18Merge branch 'bugfix/filter-boosted-blocks' into 'develop'Haelwenn
2019-04-18Merge branch 'fix/mastoapi-search-unauth' into 'develop'kaniini
2019-04-18Do not require authentication for user search in MastoAPIMark Felder
2019-04-17activitypub: fix filtering of boosts from blocked usersWilliam Pitcock
2019-04-17Merge branch 'feature/improve-block-filtering' into 'develop'kaniini
2019-04-17activitypub: properly filter out transitive activities concerning blocked usersWilliam Pitcock
2019-04-17Resolve conflictsRoman Chvanikov
2019-04-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/dig...Roman Chvanikov
2019-04-17Merge branch '788-notify-email-changelog' into 'develop'rinpatch
2019-04-17[#923] Minor semantic adjustment.Ivan Tashkinov
2019-04-17changesAlex S
2019-04-17changelog infoAlex S
2019-04-16Merge branch 'feature/788-separate-email-addresses' into 'develop'kaniini
2019-04-16Merge branch 'fix/remote-follow-auth' into 'develop'kaniini
2019-04-16Merge branch 'bugfix/relax-spam-protection' into 'develop'Haelwenn
2019-04-16Merge branch 'patch-2' into 'develop'kaniini
2019-04-16Merge branch 'fix/follow-imports' into 'develop'kaniini
2019-04-16Handle new-style mastodon follow listsNormandy
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-14Update updated_at field on notification readRoman Chvanikov
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