summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-11-04Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the ↵eugenijm
`conversation` stream event payload.
2019-11-04add missing tesla mocksSteven Fuchs
2019-11-04Merge branch 'faster-user-deactivation' into 'develop'kaniini
User: Don't pull remote users follower count immediately after deactivating. Closes #1369 See merge request pleroma/pleroma!1933
2019-11-04Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'lain
Store status data inside flag activity See merge request pleroma/pleroma!1849
2019-11-04User: Don't pull remote users follower count immediately after deactivating.lain
The other instance doesn't necessarily know that anything changed yet, and it will be fixed up at the next user pull anyway. Closes #1369
2019-11-03Merge branch 'bugfix/streamer-follows' into 'develop'rinpatch
streamer: use direct object for filter checks when there is no valid child object in an activity Closes #1291 See merge request pleroma/pleroma!1931
2019-11-03Merge branch 'feature/omit-relay-user' into 'develop'kaniini
AdminAPI: Omit relay user from users list Closes #1349 See merge request pleroma/pleroma!1924
2019-11-03Merge branch 'feature/fast_sanitize' into 'develop'kaniini
Switching to FastSanitize See merge request pleroma/pleroma!1916
2019-11-03streamer: use direct object for filter checks when there is no valid child ↵Ariadne Conill
object in an activity We call Object.normalize/1 to get the child object for situations like Announce. However, the check is flawed and immediately fails if Object.normalize/1 fails. Instead, we should use the activity itself in those cases to allow activities which never have a child object to pass through the filter. Closes #1291
2019-11-01Fix moderation log crashMaxim Filippov
2019-11-01Undo dialyzer fixMaxim Filippov
2019-10-31Fix countMaxim Filippov
2019-10-31AdminAPI: Omit relay user from users listMaxim Filippov
2019-10-31Fix "the call ... will never return" warningMaxim Filippov
2019-10-30Merge branch 'develop' into feature/fast_sanitizeMark Felder
2019-10-30Fix duplicate recipientskPherox
2019-10-30Rip out the rest of htmlsanitizeexrinpatch
2019-10-29Remove commented-out coderinpatch
2019-10-29Add pending to handle incoming for Follow activitykPherox
2019-10-29Switch from HtmlSanitizeEx to FastSanitizerinpatch
2019-10-28Merge branch 'refactor/following-relationships' into 'develop'lain
Move following relationships to a separate table Closes #1233 See merge request pleroma/pleroma!1814
2019-10-27Fix report parsingMaxim Filippov
2019-10-27Merge branch 'develop' into feature/store-statuses-data-inside-flagMaxim Filippov
2019-10-27Strip status data from Flag (when federating or closing/resolving report)Maxim Filippov
2019-10-26Mark the conversations with the blocked user as read and update the blocking ↵eugenijm
user's `unread_conversation_count`. Since the conversations with the blocked user are invisible, they are excluded from the blocking user's `unread_conversation_count`.
2019-10-25Merge branch 'remove-unsed-info-fields-fn' into 'develop'rinpatch
Remove unused Pleroma.User.info_fields/0 See merge request pleroma/pleroma!1882
2019-10-25Remove unused Pleroma.User.info_fields/0Egor Kislitsyn
2019-10-24object fetcher error handlingstwf
2019-10-24Merge remote-tracking branch 'upstream/develop' into ↵Egor Kislitsyn
refactor/following-relationships
2019-10-23Store status data inside Flag activityMaxim Filippov
2019-10-23[#1304] Extra bullet-proofing.Ivan Tashkinov
2019-10-23[#1304] Adjusted User.Info references from Notification.Ivan Tashkinov
2019-10-23Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # lib/pleroma/notification.ex
2019-10-23[#1304] Fixed null::jsonb handling in User.Info migration.Ivan Tashkinov
2019-10-22activitypub: visibility: refactor is_public?() to use JSON-LD safe accessorsAriadne Conill
2019-10-21Merge branch 'feature/push-subject-for-dm' into 'develop'kaniini
Direct messages should provide a distinct push notification subject See merge request pleroma/pleroma!1864
2019-10-21Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'rinpatch
Do not include notifications from blocked users when with_muted is set See merge request pleroma/pleroma!1869
2019-10-21Do not include notifications from blocked users when with_muted is setrinpatch
This is not what with_muted is for per documentation and it was agreed on irc that this behavior doesn't make sense.
2019-10-21[#1304] Merged `develop`, handled User.Info.invisible.Ivan Tashkinov
2019-10-21Merge branch 'develop' into feature/masto_api_markersMaksim Pechnikov
2019-10-21Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex
2019-10-21Fix RelayEgor Kislitsyn
2019-10-21Merge branch 'develop' into refactor/following-relationshipsEgor Kislitsyn
2019-10-20[#1304]. Post-merge fixes. Merge branch 'develop' of ↵Ivan Tashkinov
git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs
2019-10-20Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs
2019-10-20[#1304] Analysis issue fix.Ivan Tashkinov
2019-10-20[#1304] Moved remaining fields from User.Info to User.Ivan Tashkinov
Misc. fixes / improvements.
2019-10-19rework to use properties instead of compound typing, per SocialCGAriadne Conill
2019-10-19implement invisible support for remote usersAriadne Conill
2019-10-19user: implement User.invisible?/1Ariadne Conill
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-25 13:13:30 +0000