summaryrefslogtreecommitdiff
path: root/test/web/activity_pub
AgeCommit message (Collapse)Author
2020-01-12Merge branch 'develop' into issue/1354Mark Felder
2019-12-21moved remote follow in separate controllerMaksim Pechnikov
2019-12-19Do not crash when remote user follower and following counters are hiddenEgor Kislitsyn
2019-12-17Hide follower counter when hiding is activatedEgor Kislitsyn
2019-12-16tests: remove a useless 3 second sleeprinpatch
the ids favs use are accurate down to a microsecond, there is no need for it
2019-12-11Merge branch 'develop' into issue/1411Mark Felder
2019-12-10Merge branch 'develop' into 'domain-block-precedence'Sadposter
# Conflicts: # lib/pleroma/user.ex
2019-12-10make analysis happySadposter
2019-12-10modify SQL to include followed-but-domain-blocked activitiesSadposter
2019-12-08Merge branch 'improve-move-notificaions-api' into 'develop'rinpatch
Add `with_move` query param to the notifications API See merge request pleroma/pleroma!2032
2019-12-06Merge branch 'develop' into fix/mrf-deleterinpatch
2019-12-05ActivityPub: Fix deletes being exempt from MRFrinpatch
Closes #1461
2019-12-05Merge branch '1335-user-api-id-fields-relations' into 'develop'lain
[#1335] User: refactoring of AP ID fields into relations Closes #1335 See merge request pleroma/pleroma!1963
2019-12-05Merge branch 'feature/admin-api-render-whole-status' into 'develop'feld
Miscellaneous grouped reports fixes Closes admin-fe#48 and admin-fe#51 See merge request pleroma/pleroma!2007
2019-12-05Merge branch 'develop' into issue/1411Maksim Pechnikov
2019-12-04Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user.ex
2019-12-03Add `with_move` query param to the notifications APIEgor Kislitsyn
2019-12-02Merge branch 'feature/move-activity' into 'develop'lain
Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883
2019-12-01Merge branch 'develop' into issue/1411Maksim Pechnikov
2019-11-30test missing first fieldkPherox
2019-11-29Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # mix.lock
2019-11-28Cleanup tests outputEgor Kislitsyn
2019-11-26Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex
2019-11-26Merge branch 'develop' into feature/admin-api-render-whole-statusMaxim Filippov
2019-11-26AdminAPI: Grouped reports old/new fixMaxim Filippov
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
2019-11-25ActivityPub controller: do not render remote usersrinpatch
2019-11-19[#1335] Implemented notification mutes and reblog mutes as ↵Ivan Tashkinov
UserRelationships. User to UserRelationship relations and functions refactoring.
2019-11-19fix order favorites activitesMaksim Pechnikov
2019-11-18added testMaksim Pechnikov
2019-11-15Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-15[#1335] Reorganized `users.mutes` as relation to UserMute entity.Ivan Tashkinov
2019-11-14fix credoAriadne Conill
2019-11-14MRF: add ObjectAgePolicy which deals with old posts being importedAriadne Conill
2019-11-14Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'feld
Admin API: Grouped reports, update multiple reports in one query Closes admin-fe#43 See merge request pleroma/pleroma!1815
2019-11-14Merge remote-tracking branch 'upstream/develop' into feature/move-activityEgor Kislitsyn
2019-11-12Add a notification for Move activitiesEgor Kislitsyn
2019-11-12Add `allow_following_move` setting to UserEgor Kislitsyn
2019-11-11Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-11-10[#1335] User: refactored :blocks field into :blocked_users relation.Ivan Tashkinov
Introduced UserBlock.
2019-11-10Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-11-10add subject to atom feedMaksim Pechnikov
2019-11-08Merge remote-tracking branch 'origin/develop' into reactionslain
2019-11-08Support old flag formatMaxim Filippov
2019-11-04Merge branch 'transmogrifier-test-errors' into 'develop'lain
capture test log where errors are expected See merge request pleroma/pleroma!1915
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-10-30Merge branch 'develop' into feature/fast_sanitizeMark Felder
2019-10-30Handle "Move" activityEgor Kislitsyn
2019-10-29Add test follow activity for locked accountkPherox
2019-10-29Switch from HtmlSanitizeEx to FastSanitizerinpatch
2019-10-28capture where errors are expectedstwf
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-25 16:01:42 +0000