aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-20Digest emailsRoman Chvanikov
2019-04-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Roman Chvanikov
feature/digest-email
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
Feature/805 server rendered rel me links Closes #805 See merge request pleroma/pleroma!1063
2019-04-19typo fixAlexander Strizhakov
docs for RelMe provider
2019-04-19Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'lambda
OAuth consumer params handling refactoring See merge request pleroma/pleroma!1047
2019-04-18Merge branch 'bugfix/filter-boosted-blocks' into 'develop'Haelwenn
activitypub: fix filtering of boosts from blocked users See merge request pleroma/pleroma!1074
2019-04-18Merge branch 'fix/mastoapi-search-unauth' into 'develop'kaniini
Do not require authentication for user search in MastoAPI See merge request pleroma/pleroma!1075
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
activitypub: properly filter out transitive activities concerning blocked users See merge request pleroma/pleroma!1072
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 ↵Roman Chvanikov
feature/digest-email
2019-04-17Merge branch '788-notify-email-changelog' into 'develop'rinpatch
changelog info See merge request pleroma/pleroma!1070
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
Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040
2019-04-16Merge branch 'fix/remote-follow-auth' into 'develop'kaniini
Fix: remote follows should not ask user to log-in again for authorization See merge request pleroma/pleroma!1060
2019-04-16Merge branch 'bugfix/relax-spam-protection' into 'develop'Haelwenn
activitypub: allow indirect messages from users being followed at a personal inbox See merge request pleroma/pleroma!1069
2019-04-16Merge branch 'patch-2' into 'develop'kaniini
Add supervisord configuration See merge request pleroma/pleroma!1066
2019-04-16Merge branch 'fix/follow-imports' into 'develop'kaniini
Handle new-style mastodon follow lists Closes #814 See merge request pleroma/pleroma!1067
2019-04-16Handle new-style mastodon follow listsNormandy
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
2019-04-16activitypub: allow indirect messages from users being followed at a personal ↵William Pitcock
inbox
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
Allow instance admins to set their own SameSite cookie policy from the config. Default value in the config is `Lax`.
2019-04-16Merge branch 'deps/bump-exdoc' into 'develop'rinpatch
Bump ex_doc to 20.2 See merge request pleroma/pleroma!1068
2019-04-16Bump ex_docrinpatch
2019-04-16Add supervisord configurationDominik V. Salonen
2019-04-15Merge branch 'remove-footguns' into 'develop'rinpatch
Remove ambiguous documentation regarding emoji and config.exs See merge request pleroma/pleroma!1064
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
Assign reblogged in the Mastodon reblog status view Closes #812 See merge request pleroma/pleroma!1057
2019-04-15Merge branch 'unfollow-oneself' into 'develop'lambda
Consistent response for self follow/unfollow Closes #819 See merge request pleroma/pleroma!1061
2019-04-15Merge branch 'refactor/remove-inReplyToStatusId' into 'develop'lambda
Remove inReplyToStatusId See merge request pleroma/pleroma!1062
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
fix pattern match on user registration See merge request pleroma/pleroma!1058
2019-04-14Update updated_at field on notification readRoman Chvanikov
2019-04-14Revert "Assert on the success of enqueue before returning"Sadposter
This reverts commit 16d8c8b33b654b88e5e934832d5e26eb7152633e. Because it breaks everything
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
deliver_async will return a single atom
2019-04-14Assign reblogged in the Mastodon reblog status vieweugenijm
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-25 02:25:00 +0000