lain
|
c95859e45b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
|
2020-09-22 17:13:46 +02:00 |
|
|
lain
|
b36b6259d8
|
Merge branch 'issue/2099' into 'develop'
[#2099] Import/export mutes [BE]
See merge request pleroma/pleroma!2965
|
2020-09-21 16:25:17 +00:00 |
|
|
rinpatch
|
51116b5392
|
OpenAPI: fix various errors pointed out by editor.swagger.io
|
2020-09-19 16:26:15 +03:00 |
|
|
Maksim Pechnikov
|
2ec0dcf001
|
Merge branch 'develop' into issue/2099
|
2020-09-18 07:08:37 +03:00 |
|
|
Haelwenn (lanodan) Monnier
|
7bf269fe83
|
Fix MRF reject for ChatMessage
|
2020-09-17 22:07:54 +03:00 |
|
|
eugenijm
|
c711a2b157
|
Return the file content for GET /api/pleroma/admin/instance_document/:document_name
|
2020-09-17 16:55:53 +03:00 |
|
|
eugenijm
|
582ad5d4e1
|
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
|
2020-09-17 16:48:07 +03:00 |
|
|
Alex Gleason
|
9733c9d065
|
Merge remote-tracking branch 'upstream/develop' into chat-moderation
|
2020-09-11 14:13:38 -05:00 |
|
|
Alex Gleason
|
02d70228b5
|
AdminAPI: fix delete chat message
|
2020-09-11 14:10:35 -05:00 |
|
|
Alex Gleason
|
9dd0b23da4
|
AdminAPI: show chat
|
2020-09-11 14:10:28 -05:00 |
|
|
Alex Gleason
|
f13b52a703
|
AdminAPI: list messages in a chat
|
2020-09-11 14:10:19 -05:00 |
|
|
Alex Gleason
|
b40a627ab0
|
AdminAPI: delete a chat message
|
2020-09-11 14:09:58 -05:00 |
|
|
Maksim Pechnikov
|
9853c90abb
|
added paginate links to headers for /chats/:id/messages
|
2020-09-10 12:39:29 +03:00 |
|
|
Maksim Pechnikov
|
917d325972
|
added api spec
|
2020-09-07 07:17:30 +03:00 |
|
|
Haelwenn (lanodan) Monnier
|
d872858046
|
Fix removing an account from a list
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
|
2020-09-01 12:49:32 +02:00 |
|
|
Alexander Strizhakov
|
7dc275b69b
|
relay fix for admin-fe
|
2020-08-19 08:41:39 +03:00 |
|
|
Maksim Pechnikov
|
345ac512e4
|
added paginate+search for admin/MediaProxy URLs
|
2020-08-11 10:30:13 +03:00 |
|
|
Ivan Tashkinov
|
27b0a8b155
|
[#1985] Prevented force login on registration if account approval and/or email confirmation needed.
Refactored login code in OAuthController, reused in AccountController. Added tests.
|
2020-07-31 14:13:38 +03:00 |
|
|
lain
|
a3c37379e9
|
ChatMessage schema: Add preview cards.
|
2020-07-30 19:57:45 +02:00 |
|
|
Alibek Omarov
|
6107440ea0
|
OpenAPI: remove accidentally pasted buffer data
|
2020-07-26 13:59:46 +00:00 |
|
|
Alibek Omarov
|
b31844d6e0
|
OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
|
2020-07-26 13:54:56 +00:00 |
|
|
Mark Felder
|
4bfad0b483
|
Support blocking via query parameters as well and document the change.
|
2020-07-23 12:59:40 -05:00 |
|
|
Egor Kislitsyn
|
bdb3375933
|
Allow unblocking a domain via query params
|
2020-07-21 16:06:46 +04:00 |
|
|
Alex Gleason
|
48f8b26c92
|
OpenAPI: Add :id to follower/following endpoints, fixes #1958
|
2020-07-17 12:35:28 -05:00 |
|
|
Mark Felder
|
9d30bacace
|
Merge branch 'develop' into refactor/notification_settings
|
2020-07-15 09:30:23 -05:00 |
|
|
Ivan Tashkinov
|
124b4709dc
|
[#1940] Added admin_token param (as admin_api_params/0) to existing Admin API OpenAPI operations.
|
2020-07-14 19:31:05 +03:00 |
|
|
Mark Felder
|
80c21100db
|
Merge branch 'develop' into refactor/notification_settings
|
2020-07-13 13:32:21 -05:00 |
|
|
lain
|
b39eb6ecc5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
2020-07-10 12:26:53 +02:00 |
|
|
lain
|
8ca1f3e8c6
|
Merge branch '1723-token-fixes' into 'develop'
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
|
2020-07-09 13:10:05 +00:00 |
|
|
lain
|
f4469dc741
|
Merge branch 'features/favicons' into 'develop'
Add support for remote favicons
See merge request pleroma/pleroma!2261
|
2020-07-09 13:09:31 +00:00 |
|
|
lain
|
c0385cf47a
|
AccountController: Fix muting / unmuting reblogs.
|
2020-07-08 11:52:29 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
31fef95e35
|
Add changelog and documentation
|
2020-07-08 06:29:24 +02:00 |
|
|
lain
|
c8dd973af5
|
AccountController: Remove unused update_? routes.
These were not documented and are also not used anymore.
|
2020-07-07 16:53:20 +02:00 |
|
|
lain
|
74b88c0a8b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
2020-07-06 11:27:06 +02:00 |
|
|
lain
|
d3efb50262
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
|
2020-07-03 16:44:31 +02:00 |
|
|
lain
|
e3b5559780
|
AccountController: Make setting accepts_chat_messages possible.
|
2020-07-03 15:54:25 +02:00 |
|
|
lain
|
3ca9af1f9f
|
Account Schema: Add accepts_chat_messages
|
2020-07-03 14:31:04 +02:00 |
|
|
Egor Kislitsyn
|
979f02ec94
|
Fix CastAndValidate plug
|
2020-06-29 17:33:00 +04:00 |
|
|
lain
|
e374872fe7
|
AccountOperation: Correctly describe create response.
|
2020-06-29 13:49:48 +02:00 |
|
|
lain
|
577da132da
|
Merge branch '1031-parent-visible' into 'develop'
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
|
2020-06-29 08:39:51 +00:00 |
|
|
Haelwenn (lanodan) Monnier
|
9f51b03eed
|
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
|
2020-06-29 03:31:33 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
244655e884
|
MastoAPI: Show source field when deleting
|
2020-06-26 19:52:20 +02:00 |
|
|
Mark Felder
|
69848d5c97
|
Rename notification "privacy_option" setting
|
2020-06-26 12:45:46 -05:00 |
|
|
Mark Felder
|
fd5e797379
|
Simplify notification filtering settings further
|
2020-06-26 11:24:28 -05:00 |
|
|
lain
|
f378e93bf4
|
AccountController: Return scope in proper format.
|
2020-06-26 16:15:27 +02:00 |
|
|
Mark Felder
|
433c01b370
|
Merge branch 'develop' into refactor/notification_settings
|
2020-06-25 14:26:21 -05:00 |
|
|
lain
|
4c5fb831b3
|
Status schema: Add parent_visible.
|
2020-06-24 14:33:00 +02:00 |
|
|
lain
|
46f7e51b27
|
Merge branch 'add-muted-to-notifications' into 'develop'
Add `pleroma.is_muted` property to notifications
Closes #1812
See merge request pleroma/pleroma!2670
|
2020-06-22 15:40:09 +00:00 |
|
|
Egor Kislitsyn
|
b3a549e916
|
Update NotificationOperation spec
|
2020-06-22 19:18:33 +04:00 |
|
|
lain
|
59bdef0c33
|
Merge branch 'feature/1739-account-endpoints' into 'develop'
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
|
2020-06-22 12:37:10 +00:00 |
|