summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-04-18Merge branch 'develop' into feature/database-compactionrinpatch
2019-04-18Fix search in TwitterAPIrinpatch
2019-04-18Fix object search depending on embeded objectrinpatch
2019-04-18Fix media timeline depending on embeded object and add some guardsrinpatch
2019-04-18Use the preloaded object in tag queriesrinpatch
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-17Remove containment tests from transmogrifier and fix thread visibility solverrinpatch
2019-04-17Fix delete-by_ap_id to expect not only embeded objectsrinpatch
2019-04-17Remove updating reply count for embeded objectsrinpatch
2019-04-17If it's an object struct it is already normalizedrinpatch
2019-04-17oofrinpatch
2019-04-17Make credo happyrinpatch
2019-04-17Fix unbookmarkingrinpatch
2019-04-17Update functions in object fetcher for tesla and set up a proper mock for testsrinpatch
2019-04-17Added some more normalization calls all in mastodon api controllerrinpatch
2019-04-17Resolve conflictsRoman Chvanikov
2019-04-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Roman Chvanikov
feature/digest-email
2019-04-17Fix pinned posts relying on embded objectsrinpatch
2019-04-17Merge branch 'develop' into feature/database-compactionrinpatch
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-15Conversation: Add accounts to output.lain
2019-04-15Conversation: Return full status object, id is a string.lain
2019-04-15Conversation: Also create participations for remote users.lain
Needed to get the participating user list.
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-12add testsEgor Kislitsyn
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-18 14:20:10 +0000