Commit Graph

2817 Commits (52a0bf62f51d689cdc6f108cbefcb244a4a3737f)

Author SHA1 Message Date
Sadposter 5abee19b63 make analysis happy
5 years ago
Sadposter 19d228cc58 modify SQL to include followed-but-domain-blocked activities
5 years ago
minibikini 43d9c06a2a Merge branch 'develop' into 'feature/custom-runtime-modules'
5 years ago
lain 1ae976ac51 Merge branch 'develop' into '1427-oauth-admin-scopes'
5 years ago
Hakaba Hitoyo 701815e64c [ActivityPub] Configurable ActivityPub actor type
5 years ago
Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
5 years ago
Maksim Pechnikov 9dfaa0b832 fix loads config variable with large value from db
5 years ago
rinpatch 37c34ccec3 Merge branch 'fix/prefer-url-over-search' into 'develop'
5 years ago
rinpatch f4b7f32d51 status search: prefer the status fetched by url over other results
5 years ago
Egor Kislitsyn c098dec473 Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
lain b3c80b8404 Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
5 years ago
Maksim Pechnikov 95e6a2acd9 Merge branch 'develop' into issue/1342
5 years ago
rinpatch 8404f8c8fb Merge branch 'improve-move-notificaions-api' into 'develop'
5 years ago
rinpatch 29a3f70cba Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
5 years ago
Maxim Filippov cc36a8ea90 Fix test
5 years ago
Maxim Filippov a7f77785c2 Implement report notes destruction
5 years ago
Ivan Tashkinov 1770602747 [#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.
5 years ago
Ivan Tashkinov 40e1817f70 [#1427] Fixes / improvements of admin scopes support. Added tests.
5 years ago
rinpatch 6cb31edd76 Merge branch 'feature/1455-chat-character-limit' into 'develop'
5 years ago
lain e8cee4d9a0 ActivityPub: For user timelines, respects blocks.
5 years ago
Egor Kislitsyn a75d4a41e0 Add a test for custom runtime modules
5 years ago
Maxim Filippov 08c89fd2b8 Fix incorrect report count
5 years ago
Ivan Tashkinov 13926537b6 Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
Ivan Tashkinov af42c00cff [#1427] Reworked admin scopes support.
5 years ago
rinpatch cdff5b8267 Merge branch 'develop' into fix/mrf-delete
5 years ago
rinpatch 9f99640cfc ActivityPub: Fix deletes being exempt from MRF
5 years ago
lain 67d8df04a4 Merge branch '1335-user-api-id-fields-relations' into 'develop'
5 years ago
feld d0bd4348b3 Merge branch 'feature/admin-api-render-whole-status' into 'develop'
5 years ago
Maksim Pechnikov 3fe7a1fd35 Merge branch 'develop' into issue/1342
5 years ago
Maksim Pechnikov e21afdb7c7 Merge branch 'develop' into issue/1411
5 years ago
Egor Kislitsyn d4953474ac Merge branch 'develop' into improve-move-notificaions-api
5 years ago
Maxim Filippov 4453a9cb73 Add failing test, which exposes a bug
5 years ago
Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
lain 24599c519f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit
5 years ago
Maksim Pechnikov ed7f850ad2 fix test
5 years ago
lain aa97fe8f17 ChatChannel: Ignore messages that are too long.
5 years ago
Maxim Filippov 4b60d41db9 Add report notes
5 years ago
Egor Kislitsyn 624e720aa4 Add `with_move` query param to the notifications API
5 years ago
lain 7722e5a67a Merge branch 'feature/move-activity' into 'develop'
5 years ago
Maksim Pechnikov 88f7cf51d4 Merge branch 'develop' into issue/1411
5 years ago
rinpatch 0d24ab04c5 Merge branch 'remove-info-from-users' into 'develop'
5 years ago
kPherox 1915b23e72
test missing first field
5 years ago
Egor Kislitsyn a98cda7758
Fix Pleroma.HTML.extract_first_external_url/2
5 years ago
Ivan Tashkinov 52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Maksim Pechnikov 04a8ffbe84 added privacy option to push notifications
5 years ago
Maksim Pechnikov a52da55eb9 added User.NotificationSetting struct
5 years ago
lain 98990d2d61 Merge branch 'fed-testing-updates' into 'develop'
5 years ago
lain 8627fb0bb5 Merge branch 'cleanup-tests-output' into 'develop'
5 years ago
Sadposter c7cc80a9ee obligatory format commit
5 years ago
Sadposter fa97eddf8a make follows take precedence over domain blocks
5 years ago
Egor Kislitsyn c4b468a95b
Cleanup tests output
5 years ago
Maxim Filippov fcabcab443 Fetch account from report, not from status (it might be deleted)
5 years ago
Maxim Filippov 5135656f57 Handle reopened reports with deleted statuses
5 years ago
lain 50b152766f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
5 years ago
lain f36724efb1 User: Never return nil for user follower counts.
5 years ago
Egor Kislitsyn f595cfe623
Remove User.user_info/2
5 years ago
Egor Kislitsyn 1fc28a4b44
Add a view for the move notification
5 years ago
stwf bd1984f054 update tests and Oban
5 years ago
lain 717d246491 Tests: Don't run federated tests by default
5 years ago
Chris McCord f01881e82a Add federated test infrastructure
5 years ago
Ivan Tashkinov c8d3c3bfec Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Maxim Filippov 5869a43fe7 Fix tests
5 years ago
Maxim Filippov b62be2564c Merge branch 'develop' into feature/admin-api-render-whole-status
5 years ago
lain dc9090810d Merge branch 'fix/ap-disable-remote-render' into 'develop'
5 years ago
Maxim Filippov b3b4e5ca80 AdminAPI: Grouped reports old/new fix
5 years ago
rinpatch 4b10804f21 OStatus controller: don't serve json at /notice/, redirect instead
5 years ago
rinpatch 02f7383891 ActivityPub controller: do not render remote users
5 years ago
feld 5f981178d0 Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
5 years ago
Sadposter d3656c2725 add ability to set a custom user-agent string
5 years ago
Maxim Filippov 82f4e4760e Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov fd24467b92 Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov 2b341627da Admin API: Render whole status in grouped reports
5 years ago
Ivan Tashkinov 1636cc5b7e Removed users.info and remaining usages.
5 years ago
lain bd62946020 Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
5 years ago
Ivan Tashkinov cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
lain 8feb5dcb42 Merge branch 'issue/1348' into 'develop'
5 years ago
Egor Kislitsyn d38ab4bb89
Fix user.following_count
5 years ago
Ivan Tashkinov 4f88b1b435 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
Egor Kislitsyn 63711258ce
Fix sporadically failing test
5 years ago
Ivan Tashkinov 565f261338 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov ba5cc30165 [#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
5 years ago
Maksim Pechnikov 708fd234bd fix order favorites activites
5 years ago
Maxim Filippov b88dbc17c8 Fix tests
5 years ago
Maxim Filippov 46eb160135 AdminAPI: Confirm user account, resend confirmation email
5 years ago
Egor Kislitsyn 36686f5245
Support authentication via `x-admin-token` HTTP header
5 years ago
Maksim Pechnikov 7d727dbfec added test
5 years ago
Ivan Tashkinov 3aaf3aa2c2 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
kaniini 81cba405af Merge branch 'nodeinfo-fields-limit' into 'develop'
5 years ago
Ivan Tashkinov 01d9c093c3 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov c31ddce51e [#1335] Reorganized `users.mutes` as relation to UserMute entity.
5 years ago
kPherox c9a06b14ab Add test
5 years ago
rinpatch 22554ac5ca Merge branch 'bugfix/1395-email-activation' into 'develop'
5 years ago
Ariadne Conill 7c59bc9ef9 fix credo
5 years ago
Ariadne Conill 5705cf0e3e MRF: add ObjectAgePolicy which deals with old posts being imported
5 years ago
Maxim Filippov 114930b5fd Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov 30af5da330 Admin API: list all statuses from a given instance
5 years ago
feld 1afeaf82fa Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
5 years ago
Egor Kislitsyn 3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
rinpatch 6085c71bd1 Merge branch 'reactions' into 'develop'
5 years ago