aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
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-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-18Do not require authentication for user search in MastoAPIMark Felder
2019-04-17activitypub: fix filtering of boosts from blocked usersWilliam Pitcock
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-17[#923] Minor semantic adjustment.Ivan Tashkinov
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-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-16make Pleroma.Endpoint use extra_cookie_attrs in configHakurei Reimu
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-15Use User.get_cached_by*eugenijm
2019-04-15Remove inReplyToStatusIdrinpatch
2019-04-15Handle follow/unfollow directed to themselveseugenijm
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
2019-04-14Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Roman Chvanikov
feature/digest-email
2019-04-13Add User.Info.email_notificationsRoman Chvanikov
2019-04-13Merge develop to 788-separate-email-addressesAlex S
Merge conflicts: test/web/twitter_api/twitter_api_test.exs test/web/twitter_api/twitter_api_controller_test.exs test/web/admin_api/admin_api_controller_test.exs
2019-04-13fallback to the old behaviourAlex S
admin and user mailers
2019-04-12Revert "simplify mentions escape"Egor
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
2019-04-12Merge branch 'bugfix/pleroma-email-naming' into 'develop'lambda
Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029
2019-04-12Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'lambda
Features: mastoapi-2.6.0 `min_id` pagination Closes #351 See merge request pleroma/pleroma!976
2019-04-12Merge branch 'fix/732-password-align' into 'develop'lambda
password reset page labels align See merge request pleroma/pleroma!986
2019-04-12adding destroy multiple for mastofeAlexander Strizhakov
2019-04-12in_reply_to_id - nullAlexander Strizhakov
2019-04-11Merge branch 'fix/hackney_max_body_param' into 'develop'kaniini
Add `with_body: true` to requests relying on `max_body: val` Closes #778 See merge request pleroma/pleroma!1049
2019-04-12Add `with_body: true` to requests relying on `max_body: val`Roman Chvanikov
2019-04-10[#923] OAuth consumer params handling refactoring.Ivan Tashkinov
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
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
Feature/767 multiple use invite token See merge request pleroma/pleroma!1032
2019-04-10Merge branch 'develop' into feature/user-status-subscriptionsSadposter
2019-04-10Merge branch 'fix/emoji-api-nonsense' into 'develop'lambda
Change response format of /api/pleroma/emoji so it makes sense See merge request pleroma/pleroma!1038
2019-04-10s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/Haelwenn (lanodan) Monnier
2019-04-10s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/Haelwenn (lanodan) Monnier
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-25 05:04:23 +0000