aboutsummaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Collapse)Author
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-08Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'rinpatch
ActivityPub: For user timelines, respects blocks. Closes #1463 See merge request pleroma/pleroma!2041
2019-12-06Merge branch 'feature/1455-chat-character-limit' into 'develop'rinpatch
Feature/1455 chat character limit Closes #1455 See merge request pleroma/pleroma!2034
2019-12-06ActivityPub: For user timelines, respects blocks.lain
Unless the timeline belongs to a blocked user.
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 improve-move-notificaions-apiEgor Kislitsyn
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-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/1455-chat-character-limit
2019-12-04fix testMaksim Pechnikov
2019-12-04ChatChannel: Ignore messages that are too long.lain
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-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-28Merge branch 'cleanup-tests-output' into 'develop'lain
Cleanup tests output See merge request pleroma/pleroma!2018
2019-11-28Cleanup tests outputEgor Kislitsyn
2019-11-28Fetch account from report, not from status (it might be deleted)Maxim Filippov
2019-11-27Handle reopened reports with deleted statusesMaxim Filippov
2019-11-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
bugfix/1442-dont-return-nil-for-following-count
2019-11-27Remove User.user_info/2Egor Kislitsyn
2019-11-27Add a view for the move notificationEgor 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-26Fix testsMaxim Filippov
2019-11-26Merge branch 'develop' into feature/admin-api-render-whole-statusMaxim Filippov
2019-11-25Merge branch 'fix/ap-disable-remote-render' into 'develop'lain
Disable rendering AP representation for remote users and objects See merge request pleroma/pleroma!2010
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-25OStatus controller: don't serve json at /notice/, redirect insteadrinpatch
2019-11-25ActivityPub controller: do not render remote usersrinpatch
2019-11-25Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-25Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-25Admin API: Render whole status in grouped reportsMaxim Filippov
2019-11-22Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'lain
AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994
2019-11-21Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs
2019-11-21Merge branch 'issue/1348' into 'develop'lain
[#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937
2019-11-20Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-20[#1335] Reorganized users.subscribers as UserRelationship. Added tests for ↵Ivan Tashkinov
UserRelationship-related functionality.
2019-11-20Fix sporadically failing testEgor Kislitsyn
2019-11-19[#1335] Implemented notification mutes and reblog mutes as ↵Ivan Tashkinov
UserRelationships. User to UserRelationship relations and functions refactoring.
2019-11-19Fix testsMaxim Filippov
2019-11-19AdminAPI: Confirm user account, resend confirmation emailMaxim Filippov
2019-11-18Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-15Merge branch 'nodeinfo-fields-limit' into 'develop'kaniini
Add fieldsLimit to metadata of nodeinfo See merge request pleroma/pleroma!1983
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-15Add testkPherox
2019-11-14fix credoAriadne Conill
2019-11-14MRF: add ObjectAgePolicy which deals with old posts being importedAriadne Conill