Commit Graph

2081 Commits (7722e5a67a46304f3ae0e37f674a44ca9268be5e)

Author SHA1 Message Date
lain 7722e5a67a Merge branch 'feature/move-activity' into 'develop'
5 years ago
kPherox 1915b23e72
test missing first field
5 years ago
lain 8627fb0bb5 Merge branch 'cleanup-tests-output' into 'develop'
5 years ago
Egor Kislitsyn c4b468a95b
Cleanup tests output
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
Egor Kislitsyn f595cfe623
Remove User.user_info/2
5 years ago
Egor Kislitsyn 1fc28a4b44
Add a view for the move notification
5 years ago
lain dc9090810d Merge branch 'fix/ap-disable-remote-render' into 'develop'
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
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
lain bd62946020 Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
5 years ago
lain 8feb5dcb42 Merge branch 'issue/1348' into 'develop'
5 years ago
Egor Kislitsyn 63711258ce
Fix sporadically failing test
5 years ago
Maxim Filippov b88dbc17c8 Fix tests
5 years ago
Maxim Filippov 46eb160135 AdminAPI: Confirm user account, resend confirmation email
5 years ago
kaniini 81cba405af Merge branch 'nodeinfo-fields-limit' into 'develop'
5 years ago
kPherox c9a06b14ab Add test
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
Phil Hagelberg 3c60adbc1f Support redirecting by activity UUID in static FE as well.
5 years ago
Phil Hagelberg 0867cb083e Support redirecting by object ID in static FE.
5 years ago
Phil Hagelberg 62f3a93049 For remote notices, redirect to the original instead of 404.
5 years ago
Egor Kislitsyn 27cd1374e3
Add a notification for Move activities
5 years ago
Egor Kislitsyn e6d7e27bd6
Add `allow_following_move` setting to User
5 years ago
feld e27d78e768 Merge branch 'nodeinfo-federation-enabled' into 'develop'
5 years ago
kaniini 2cc043591c Merge branch 'feature/static-fe' into 'develop'
5 years ago
href b39b49cc14 report federating status in nodeinfo
5 years ago
lain 1ca7b877a1 Merge branch 'iss-1376' into 'develop'
5 years ago
Maxim Filippov 46787b9fe1 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Alexander 6a4201e0b4
fix for migrate task
5 years ago
lain a88e834dba Merge branch 'develop' into 'reactions'
5 years ago
Maksim Pechnikov 9d0b989521 add subject to atom feed
5 years ago
Phil Hagelberg 6ef8049664 Add changelog entry, cheatsheet docs, and alphabetize.
5 years ago
Phil Hagelberg ef7c3bdc7a Add some further test cases.
5 years ago
Phil Hagelberg 2bf592f5dc Add tests for static_fe controller.
5 years ago
lain b22ee9d966 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Maxim Filippov b14bf9044f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov 7258db023e Support old flag format
5 years ago
eugenijm 7888803ffe Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
5 years ago
Maxim Filippov f171095960 Grouped reports with status data baked in
5 years ago
AkiraFukushima e1fc6cb78f Check client and token in GET /oauth/authorize
5 years ago
Maxim Filippov 2cbfa256fd Merge branch 'develop' into feature/multiple-users-force-password-reset
5 years ago
Maxim Filippov 43ea16870f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago