aae669d05e
Merge branch 'fix/webpush-and-emojireact' into 'develop'
...
Push notifications: add pleroma:emoji_reaction, improve tests
Closes #2185
See merge request pleroma/pleroma!3141
2020-11-18 18:33:48 +00:00
5d0bc5e028
Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
2020-11-17 20:21:48 +00:00
67a6abd071
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
2020-11-17 20:20:00 +00:00
bb9650f3c2
FrontendController: Return error on installation error.
2020-11-17 16:43:07 +01:00
f69fe36ebf
Merge branch 'develop' into frontend-admin-api
2020-11-17 18:34:04 +04:00
e4b202d905
added test
2020-11-16 22:23:28 +03:00
fb41bd1a85
Hide reactions from muted and blocked users
2020-11-16 22:50:14 +04:00
36ec604521
added test
2020-11-14 08:30:22 +03:00
70e4b86250
Make notifs view work for reports
...
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
2020-11-13 13:35:46 +00:00
08cbd655d1
Merge branch 'develop' into frontend-admin-api
2020-11-11 19:53:40 +04:00
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
2020-11-04 16:51:42 +01:00
4800ee656b
Merge branch 'features/federation-status' into 'develop'
...
Add a federation_status endpoint showing unreachable instances
See merge request pleroma/pleroma!3086
2020-11-04 15:00:52 +00:00
504a829edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
2020-11-04 15:38:10 +01:00
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
2020-11-04 15:05:01 +01:00
ca95cbe0b4
Add `with_muted` param to ChatController.index/2
2020-11-04 16:40:12 +04:00
6163fbf553
Merge branch 'develop' into 'frontend-admin-api'
...
# Conflicts:
# lib/pleroma/web/router.ex
2020-11-02 10:43:45 +00:00
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-30 19:34:02 +04:00
d83c2bd330
Add support for install via `file` and `build_url` params
2020-10-29 16:37:50 +04:00
03e306785b
Add an API endpoint to install a new frontend
2020-10-27 19:20:21 +04:00
aafdc975bd
federation_status: Add ApiSpec
2020-10-16 01:14:15 +02:00
1fb9452131
Merge branch 'develop' into feature/account-export
2020-10-14 15:27:15 -05:00
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
2020-10-13 19:26:04 -05:00
7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-13 19:25:18 -05:00
6734abcbd4
Add pagination for Mutes
2020-10-13 21:58:18 +04:00
33f4f39b1c
Add pagination for Blocks
2020-10-13 21:39:41 +04:00
b5b4395e4a
oauth consistency
2020-10-13 16:38:18 +03:00
3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
2020-10-08 17:24:09 -05:00
77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-08 15:44:48 -05:00
86ce4afd93
Improve backup urls
2020-10-07 18:34:29 +04:00
2c73bfe122
Add API endpoints for Backups
2020-10-07 18:34:29 +04:00
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
2020-10-05 12:40:53 -05:00
de993b856b
added `force` option to the unfollow operation
2020-09-28 09:16:42 +03:00
5d7ec00bed
fixes after rebase
2020-09-24 09:42:30 +03:00
dbbc801667
pagination for remote emoji packs
2020-09-24 09:12:39 +03:00
9b6d89ff8c
support for special chars in pack name
2020-09-24 09:12:37 +03:00
436d1a3c41
Merge branch 'develop' into 'issue/2115'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 11:49:19 +00:00
8f5589cf66
Merge develop
2020-09-23 13:56:50 +03:00
72d2b34d3b
Merge branch 'develop' into issue/1975
2020-09-22 21:42:10 +03:00
c95859e45b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
2020-09-22 17:13:46 +02:00
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
4987ee6256
Merge branch 'develop' into feature/expire-mutes
2020-09-20 19:27:27 +03:00
51116b5392
OpenAPI: fix various errors pointed out by editor.swagger.io
2020-09-19 16:26:15 +03:00
2ec0dcf001
Merge branch 'develop' into issue/2099
2020-09-18 07:08:37 +03:00
7bf269fe83
Fix MRF reject for ChatMessage
2020-09-17 22:07:54 +03:00
c711a2b157
Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
2020-09-17 16:55:53 +03:00
582ad5d4e1
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
2020-09-17 16:48:07 +03:00
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
2020-09-11 14:13:38 -05:00
02d70228b5
AdminAPI: fix delete chat message
2020-09-11 14:10:35 -05:00
9dd0b23da4
AdminAPI: show chat
2020-09-11 14:10:28 -05:00
f13b52a703
AdminAPI: list messages in a chat
2020-09-11 14:10:19 -05:00
b40a627ab0
AdminAPI: delete a chat message
2020-09-11 14:09:58 -05:00
9853c90abb
added paginate links to headers for /chats/:id/messages
2020-09-10 12:39:29 +03:00
e3f845b243
Add expiring mutes for activities
2020-09-08 15:13:50 +03:00
c56e3d4f3b
Add expires_in param for account mutes
2020-09-08 13:26:44 +03:00
917d325972
added api spec
2020-09-07 07:17:30 +03:00
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
0922791e4d
updated errors on add emoji
2020-08-22 10:56:26 +03:00
f5845ff033
upload emoji zip file
2020-08-22 10:42:02 +03:00
7dc275b69b
relay fix for admin-fe
2020-08-19 08:41:39 +03:00
7794d7c694
added Pleroma.Web.PleromaAPI.EmojiFileController
2020-08-19 06:50:20 +03:00
345ac512e4
added paginate+search for admin/MediaProxy URLs
2020-08-11 10:30:13 +03:00
4af1b80381
Clean up account aliases
2020-08-07 17:37:15 -05:00
1a5a7ba6e8
Merge remote-tracking branch 'upstream/develop' into aliases
2020-08-07 16:35:15 -05:00
24ce9c011c
Apply 1 suggestion(s) to 1 file(s)
2020-08-05 19:33:51 +00:00
cc196e2cd5
Merge remote-tracking branch 'upstream/develop' into restrict-domain
2020-08-05 13:08:31 -05:00
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
6107440ea0
OpenAPI: remove accidentally pasted buffer data
2020-07-26 13:59:46 +00:00
b31844d6e0
OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
2020-07-26 13:54:56 +00:00
4bfad0b483
Support blocking via query parameters as well and document the change.
2020-07-23 12:59:40 -05:00
bdb3375933
Allow unblocking a domain via query params
2020-07-21 16:06:46 +04:00
afa8b469ed
Allow restricting public timeline by instance
2020-07-18 19:35:07 -05:00
d0eb43b58b
Add account aliases
2020-07-17 16:17:49 -05:00
48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
2020-07-17 12:35:28 -05:00
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
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-10 12:26:53 +02:00
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
c0385cf47a
AccountController: Fix muting / unmuting reblogs.
2020-07-08 11:52:29 +02:00
c8dd973af5
AccountController: Remove unused `update_?` routes.
...
These were not documented and are also not used anymore.
2020-07-07 16:53:20 +02:00
74b88c0a8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-06 11:27:06 +02:00
e3b5559780
AccountController: Make setting accepts_chat_messages possible.
2020-07-03 15:54:25 +02:00
e374872fe7
AccountOperation: Correctly describe create response.
2020-06-29 13:49:48 +02:00
244655e884
MastoAPI: Show source field when deleting
2020-06-26 19:52:20 +02:00
f378e93bf4
AccountController: Return scope in proper format.
2020-06-26 16:15:27 +02:00
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
b3a549e916
Update NotificationOperation spec
2020-06-22 19:18:33 +04:00
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
93ae1c8bd3
Merge branch 'feature/1854-emoji-pagination' into 'develop'
...
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
2020-06-22 08:41:09 +00:00
b5f13af7ba
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
2020-06-20 10:59:08 +00:00
0e789bc55f
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
2020-06-20 09:39:50 +00:00
02ca8a363f
default page size for files
2020-06-19 14:46:38 +03:00
4975ed86bc
emoji pagination for pack show action
2020-06-18 18:50:03 +03:00
3becdafd33
emoji packs pagination
2020-06-18 14:32:21 +03:00
3462d4b995
Merge branch 'develop' into issue/1855
2020-06-17 12:50:06 -05:00
d4b5a9730e
Remove `poll` from `notification_type` OpenAPI spec
2020-06-17 18:47:59 +04:00
579763126f
Merge branch 'develop' into issue/1855
2020-06-15 15:24:55 +03:00
271ea5068f
Merge branch '1851-favorites-pagination' into 'develop'
...
StatusController: Correctly paginate favorites.
Closes #1851
See merge request pleroma/pleroma!2636
2020-06-13 17:20:43 +00:00
f9dcf15ecb
added admin api for MediaProxy cache invalidation
2020-06-12 14:49:54 +03:00
063e6b9841
StatusController: Correctly paginate favorites.
...
Favorites were paginating wrongly, because the pagination headers
where using the id of the id of the `Create` activity, while the
ordering was by the id of the `Like` activity. This isn't easy to
notice in most cases, as they usually have a similar order because
people tend to favorite posts as they come in. This commit adds a
way to give different pagination ids to the pagination helper, so
we can paginate correctly in cases like this.
2020-06-09 10:53:40 +02:00
064c4f86f3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-09 09:36:07 +02:00
fe2a5d0614
ChatController: Make last_read_id mandatory.
2020-06-07 20:22:08 +02:00
lain