Alexander Strizhakov
|
d36c9e210a
|
StaticFEPlug module name
|
2020-10-13 16:42:52 +03:00 |
|
Alexander Strizhakov
|
ebd6dd7c53
|
UserEnabledPlug module name
|
2020-10-13 16:42:51 +03:00 |
|
Alexander Strizhakov
|
61c609884c
|
UserFetcherPlug module name
|
2020-10-13 16:42:51 +03:00 |
|
Alexander Strizhakov
|
1d16cd0c3d
|
UserIsAdminPlug module name
|
2020-10-13 16:42:50 +03:00 |
|
Alexander Strizhakov
|
0374df1d12
|
other files consistency
|
2020-10-13 16:38:19 +03:00 |
|
Ivan Tashkinov
|
89c595b772
|
[#3053] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.
|
2020-10-11 22:34:28 +03:00 |
|
Egor Kislitsyn
|
17562bf414
|
Move API endpoints to `/api/v1/pleroma/backups`
|
2020-10-07 18:35:27 +04:00 |
|
Egor Kislitsyn
|
7c22c9afb4
|
Allow admins request user backups
|
2020-10-07 18:34:31 +04:00 |
|
Egor Kislitsyn
|
2c73bfe122
|
Add API endpoints for Backups
|
2020-10-07 18:34:29 +04:00 |
|
Ivan Tashkinov
|
6c2264af24
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
|
2020-10-05 23:50:08 +03:00 |
|
Ivan Tashkinov
|
094edde7c4
|
[#3053] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.
|
2020-10-05 23:48:00 +03:00 |
|
Ivan Tashkinov
|
f6024252ae
|
[#3053] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.
|
2020-10-02 22:18:02 +03:00 |
|
Alexander Strizhakov
|
5d7ec00bed
|
fixes after rebase
|
2020-09-24 09:42:30 +03:00 |
|
Alexander Strizhakov
|
8c6ec4c111
|
pack routes change
|
2020-09-24 09:16:14 +03:00 |
|
Alexander Strizhakov
|
9b6d89ff8c
|
support for special chars in pack name
|
2020-09-24 09:12:37 +03:00 |
|
Maksim Pechnikov
|
72d2b34d3b
|
Merge branch 'develop' into issue/1975
|
2020-09-22 21:42:10 +03:00 |
|
Maksim Pechnikov
|
ed3bc53fa1
|
Merge branch 'develop' into issue/2099
|
2020-09-18 22:13:05 +03:00 |
|
Maksim Pechnikov
|
2ec0dcf001
|
Merge branch 'develop' into issue/2099
|
2020-09-18 07:08:37 +03:00 |
|
Ivan Tashkinov
|
a428800405
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
# Conflicts:
# CHANGELOG.md
|
2020-09-17 22:22:59 +03:00 |
|
Ivan Tashkinov
|
d9fb5bc08a
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
|
2020-09-17 17:14:20 +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
|
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
|
fb0de07343
|
AdminAPI: list chats for a user
|
2020-09-11 14:10:05 -05:00 |
|
Alex Gleason
|
b40a627ab0
|
AdminAPI: delete a chat message
|
2020-09-11 14:09:58 -05:00 |
|
Maksim Pechnikov
|
5ae56aafb2
|
added import mutes
|
2020-09-06 21:42:51 +03:00 |
|
Maksim Pechnikov
|
7794d7c694
|
added Pleroma.Web.PleromaAPI.EmojiFileController
|
2020-08-19 06:50:20 +03:00 |
|
Ivan Tashkinov
|
1298a2ea2c
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# mix.lock
|
2020-08-07 09:38:05 +03:00 |
|
Ivan Tashkinov
|
bdf57b8ef4
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# mix.lock
# test/web/media_proxy/media_proxy_test.exs
|
2020-07-19 20:05:37 +03:00 |
|
Alex Gleason
|
20d24741af
|
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint
|
2020-07-14 18:02:44 -05:00 |
|
Haelwenn
|
a8447c3803
|
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
|
2020-07-08 03:25:30 +00: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 |
|
Ivan Tashkinov
|
61180ab6f4
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
|
2020-07-02 16:36:54 +03:00 |
|
Egor Kislitsyn
|
67d92ac7b7
|
Remove `/statusnet/config`
|
2020-06-29 17:00:37 +04:00 |
|
Egor Kislitsyn
|
4a306720e8
|
Merge branch 'develop' into remove-twitter-api
|
2020-06-29 16:09:49 +04:00 |
|
feld
|
8288419686
|
Merge branch 'preload-data' into 'develop'
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
|
2020-06-25 21:35:39 +00:00 |
|
Haelwenn (lanodan) Monnier
|
8f6ba4b22f
|
Add warning against parsing/reusing MastoFE settings blob
|
2020-06-22 23:45:29 +02:00 |
|
Mark Felder
|
26f710b9e3
|
Merge branch 'develop' into preload-data
|
2020-06-12 16:52:52 -05:00 |
|
Maksim Pechnikov
|
f9dcf15ecb
|
added admin api for MediaProxy cache invalidation
|
2020-06-12 14:49:54 +03:00 |
|
lain
|
064c4f86f3
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-09 09:36:07 +02:00 |
|
lain
|
d192492658
|
Merge branch 'openapi/admin/relay' into 'develop'
Add OpenAPI spec for AdminAPI.RelayController
See merge request pleroma/pleroma!2579
|
2020-06-08 11:07:01 +00:00 |
|
lain
|
7d66dd180a
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-08 10:18:10 +02:00 |
|
lain
|
a8ca030d85
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-05 16:53:56 +02:00 |
|
Haelwenn
|
d74985af23
|
Merge branch 'features/apc2s-pagination' into 'develop'
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
|
2020-06-05 14:52:09 +00:00 |
|
minibikini
|
b57e4ad1ab
|
Merge branch 'develop' into 'openapi/admin/relay'
# Conflicts:
# lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
|
2020-06-04 13:29:32 +00:00 |
|
Egor Kislitsyn
|
70f054b083
|
Merge branch 'develop' into openapi/admin/relay
|
2020-06-04 13:30:14 +04:00 |
|
Egor Kislitsyn
|
b4d5bdd6f1
|
Merge branch 'develop' into openapi/admin/config
|
2020-06-04 13:28:00 +04:00 |
|
stwf
|
29ae5bb771
|
preload data into index.html
|
2020-06-03 16:34:03 -04:00 |
|
lain
|
b3407344d3
|
ChatController: Add function to mark single message as read.
|
2020-06-03 19:21:23 +02:00 |
|
Egor Kislitsyn
|
9d572f2f66
|
Move report actions to AdminAPI.ReportController
|
2020-06-03 19:17:04 +04:00 |
|
Egor Kislitsyn
|
68cb152a08
|
Merge branch 'develop' into openapi/admin/relay
|
2020-06-02 18:50:37 +04:00 |
|
lain
|
5da38c15cd
|
Merge branch 'openapi/admin/oauth-apps' into 'develop'
Add OpenAPI spec for AdminAPI.OAuthAppContoller
See merge request pleroma/pleroma!2582
|
2020-06-02 14:13:24 +00:00 |
|
lain
|
022d975a39
|
Merge branch 'openapi/admin/invites' into 'develop'
Add OpenAPI spec for AdminAPI.InviteController
See merge request pleroma/pleroma!2585
|
2020-06-02 14:10:21 +00:00 |
|
Egor Kislitsyn
|
6b84c62d4a
|
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
|
2020-06-01 17:38:57 +04:00 |
|
Haelwenn (lanodan) Monnier
|
2c18830d0d
|
Bugfix: router: allow basic_auth for outbox
|
2020-05-29 16:14:45 +02:00 |
|
Egor Kislitsyn
|
d1ee3527ef
|
Move config actions to AdminAPI.ConfigController
|
2020-05-28 22:23:15 +04:00 |
|
Egor Kislitsyn
|
fca48154a2
|
Add AdminAPI.InviteView
|
2020-05-26 15:21:33 +04:00 |
|
Egor Kislitsyn
|
95ebfb9190
|
Move invite actions to AdminAPI.InviteTokenController
|
2020-05-26 15:03:07 +04:00 |
|
Egor Kislitsyn
|
0ba1f2631a
|
Add OpenAPI spec for AdminAPI.OAuthAppContoller
|
2020-05-25 22:04:06 +04:00 |
|
Egor Kislitsyn
|
cbcd592300
|
Add OpenAPI spec for AdminAPI.RelayController
|
2020-05-25 16:51:16 +04:00 |
|
lain
|
ee35bb5ac2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-25 13:57:27 +02:00 |
|
lain
|
ec470c4c77
|
Merge branch 'openapi/admin/status' into 'develop'
Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566
|
2020-05-25 11:40:54 +00:00 |
|
lain
|
355aa3bdc7
|
ActivityPubController: Add Mastodon activity compat route.
|
2020-05-22 17:06:12 +02:00 |
|
lain
|
ca755f9a73
|
ActivityPubController: Add Mastodon compatibility route.
|
2020-05-22 16:15:29 +02:00 |
|
lain
|
578ed3a37f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-21 15:35:13 +02:00 |
|
lain
|
f166316f50
|
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
|
2020-05-21 13:30:09 +00:00 |
|
lain
|
814c3e5171
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-21 15:00:05 +02:00 |
|
Egor Kislitsyn
|
9de9760aa6
|
Move status actions to AdminAPI.StatusController
|
2020-05-21 13:52:30 +04:00 |
|
Ivan Tashkinov
|
6fd4f58ead
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
|
2020-05-20 20:27:03 +03:00 |
|
lain
|
265746b21f
|
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549
|
2020-05-20 12:08:28 +00:00 |
|
Egor Kislitsyn
|
5ba6e1c322
|
Move notification actions to PleromaAPI.NotificationController
|
2020-05-20 15:15:13 +04:00 |
|
Egor Kislitsyn
|
f3fc8b22b1
|
Move conversation actions to PleromaAPI.ConversationController
|
2020-05-20 15:15:13 +04:00 |
|
Egor Kislitsyn
|
9a5de0f454
|
Move reaction actions to EmojiReactionController
|
2020-05-20 15:15:13 +04:00 |
|
Egor Kislitsyn
|
524d04d921
|
Add OpenAPI spec for PleromaAPI.ScrobbleController
|
2020-05-19 16:26:06 +04:00 |
|
Egor Kislitsyn
|
aef31c69df
|
Rename EmojiAPIController to EmojiPackController
|
2020-05-18 19:43:25 +04:00 |
|
Egor Kislitsyn
|
6e4de715b3
|
Add OpenAPI spec for PleromaAPI.EmojiAPIController
|
2020-05-18 19:28:46 +04:00 |
|
lain
|
9c17109765
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-17 12:14:49 +02:00 |
|
lain
|
d15aa9d950
|
Merge branch 'develop' into 'remove-twitter-api'
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
|
2020-05-16 17:07:09 +00:00 |
|
Haelwenn (lanodan) Monnier
|
cb363f0183
|
MastodonAPI: /api/v2/media endpoints
|
2020-05-14 10:14:28 +02:00 |
|
lain
|
b5aa204eb8
|
ChatController: Support deletion of chat messages.
|
2020-05-12 13:13:03 +02:00 |
|
lain
|
8d5597ff68
|
ChatController: Add GET /chats/:id
|
2020-05-10 13:26:14 +02:00 |
|
Ivan Tashkinov
|
bbdad85568
|
Initial implementation of image preview proxy. Media proxy tests refactoring.
|
2020-05-08 23:06:47 +03:00 |
|
lain
|
fb2d284d28
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-07 15:05:40 +02:00 |
|
Maksim
|
3d0c567fbc
|
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
|
2020-05-07 08:14:54 +00:00 |
|
lain
|
205313e541
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-06 11:44:30 +02:00 |
|
lain
|
a716543267
|
Merge branch 'openapi/subscriptions' into 'develop'
Add OpenAPI spec for SubscriptionController
See merge request pleroma/pleroma!2444
|
2020-05-06 09:10:17 +00:00 |
|
Alexander Strizhakov
|
e7d8ab8303
|
admin_api fetch status by id
|
2020-05-05 16:18:56 +03:00 |
|
Egor Kislitsyn
|
d861b0790a
|
Add OpenAPI spec for SubscriptionController
|
2020-05-05 16:43:00 +04:00 |
|
lain
|
b04328c3de
|
ChatController: Add mark_as_read
|
2020-05-04 13:10:36 +02:00 |
|
lain
|
c40afe5ba0
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-04 10:43:20 +02:00 |
|
Ivan Tashkinov
|
2d07ed7747
|
[#1732] Made AP C2S :followers and :following endpoints serve on no auth
(as for related :api pipeline endpoints).
|
2020-05-02 18:28:04 +03:00 |
|
lain
|
3370bb0e46
|
Merge branch 'openapi/notifications' into 'develop'
Add OpenAPI spec for NotificationController
See merge request pleroma/pleroma!2437
|
2020-05-01 13:09:36 +00:00 |
|
Alexander Strizhakov
|
ddb757f743
|
emoji api packs changes in routes with docs update
|
2020-04-30 16:09:18 +03:00 |
|
Alexander Strizhakov
|
342f55fb92
|
refactor emoji api with fixes
|
2020-04-30 15:45:52 +03:00 |
|
Egor Kislitsyn
|
9c1adb35de
|
Merge branch 'develop' into openapi/notifications
|
2020-04-30 13:52:07 +04:00 |
|
lain
|
0c491b904d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-29 13:19:04 +02:00 |
|
Egor Kislitsyn
|
5238ae3dd3
|
Add OpenAPI spec for NotificationController
|
2020-04-28 21:27:54 +04:00 |
|
lain
|
ad82a216ff
|
Chat API: Align more to Pleroma/Mastodon API.
|
2020-04-27 17:48:34 +02:00 |
|
Ivan Tashkinov
|
b4139cc547
|
[#2409] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.
|
2020-04-24 22:25:27 +03:00 |
|
Ivan Tashkinov
|
00e62161f6
|
[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
|
2020-04-24 16:52:38 +03:00 |
|
Ivan Tashkinov
|
2958a7d246
|
Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
|
2020-04-22 18:50:25 +03:00 |
|
Ivan Tashkinov
|
f685cbd309
|
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
|
2020-04-21 16:29:19 +03:00 |
|
lain
|
5165287ff4
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-21 12:00:33 +02:00 |
|
Egor Kislitsyn
|
258d897579
|
Cleanup and DRY the Router
|
2020-04-20 16:39:20 +04:00 |
|
lain
|
8c2c325598
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-17 15:51:24 +02:00 |
|
Haelwenn
|
a17bfb5fab
|
Merge branch 'feature/1584-client-captcha-options' into 'develop'
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
|
2020-04-17 09:19:35 +00:00 |
|
Haelwenn
|
9c76d70a47
|
Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
Added need_reboot endpoint to admin api
Closes #1677
See merge request pleroma/pleroma!2373
|
2020-04-17 08:55:46 +00:00 |
|
Alexander Strizhakov
|
72ef6cc4f2
|
added need_reboot endpoint to admin api
|
2020-04-16 16:03:26 +03:00 |
|
Ivan Tashkinov
|
bde1189c34
|
[#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
|
2020-04-15 21:19:16 +03:00 |
|
Ivan Tashkinov
|
bedf92e064
|
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
|
2020-04-15 19:20:34 +03:00 |
|
lain
|
44bfb491ea
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-04-15 14:41:43 +02:00 |
|
lain
|
2cc6841424
|
ChatController: Basic message posting.
|
2020-04-09 17:18:31 +02:00 |
|
lain
|
e8fd0dd689
|
ChatController: Basic support for returning messages.
|
2020-04-09 16:59:49 +02:00 |
|
lain
|
68abea313d
|
ChatController: Add creation and return of chats.
|
2020-04-09 15:13:55 +02:00 |
|
Egor Kislitsyn
|
d545b883eb
|
Add `/api/v1/notifications/:id/dismiss` endpoint
|
2020-04-09 17:08:43 +04:00 |
|
Ivan Tashkinov
|
fc81e5a49c
|
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
|
2020-04-06 10:20:44 +03:00 |
|
Egor Kislitsyn
|
23219e6fb3
|
Add OpenAPI
|
2020-04-01 23:13:08 +04:00 |
|
Alexander Strizhakov
|
b607ae1a1c
|
removing grouped reports admin api endpoint
|
2020-03-30 13:51:45 +03:00 |
|
Egor Kislitsyn
|
94a6590e3c
|
Partially restore `/api/statusnet/config.json`
|
2020-03-26 17:59:45 +04:00 |
|
lain
|
1d75d0ed7a
|
Merge branch 'admin-api-change-password' into 'develop'
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
|
2020-03-24 17:34:13 +00:00 |
|
Egor Kislitsyn
|
3189c44a0c
|
Remove some TwitterAPI endpoints
|
2020-03-24 15:21:40 +04:00 |
|
Alexander Strizhakov
|
a6ee6784bc
|
creating trusted app from adminFE & mix task
|
2020-03-23 10:44:47 +03:00 |
|
Egor Kislitsyn
|
cb8236cda6
|
Add embeddable posts
|
2020-03-20 21:46:26 +04:00 |
|
eugenijm
|
13cce9c0de
|
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
|
2020-03-16 20:42:37 +03:00 |
|
eugenijm
|
d198e7fa2a
|
Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
|
2020-03-16 20:32:07 +03:00 |
|
Alexander Strizhakov
|
91870c8995
|
adding rss for user feed
|
2020-03-16 12:45:31 +03:00 |
|
Ivan Tashkinov
|
5fc92deef3
|
[#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
|
2020-03-09 20:51:44 +03:00 |
|
Ivan Tashkinov
|
b6fc98d9cd
|
[#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests.
|
2020-03-03 22:22:02 +03:00 |
|
Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
2020-03-02 06:08:45 +01:00 |
|
eugenijm
|
e2a6a40367
|
Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
|
2020-02-26 20:21:38 +03:00 |
|
eugenijm
|
7ad5c51f23
|
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
|
2020-02-24 21:46:37 +03:00 |
|
lain
|
314928333a
|
Pleroma API: Add endpoint to get reaction information on a single emoji
|
2020-02-19 17:16:45 +01:00 |
|
Lain Soykaf
|
4538a1ee01
|
EmojiReactions: Remove old API endpoints
|
2020-02-07 15:01:45 +01:00 |
|
Lain Soykaf
|
f875b9650a
|
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
|
2020-02-07 14:52:13 +01:00 |
|
Alexander Strizhakov
|
5db6ac8ee4
|
removing migrate_from_db endpoint from admin api
|
2020-02-05 20:36:21 +03:00 |
|
rinpatch
|
49e80a1537
|
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
|
2020-02-05 16:59:21 +00:00 |
|
Alexander Strizhakov
|
e93cc561cd
|
restarting pleroma from outside application
|
2020-01-25 18:42:04 +03:00 |
|
Maksim Pechnikov
|
2cfe1b9385
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-23 11:42:10 +03:00 |
|
Alexander Strizhakov
|
60ba2339a2
|
saving to DB only added by user settings
|
2020-01-17 11:45:44 +03:00 |
|
Maksim Pechnikov
|
c9f45edeac
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-14 21:29:14 +03:00 |
|
Alexander Strizhakov
|
70c7a26de8
|
Merge branch 'develop' into admin-be
|
2020-01-14 14:52:00 +03:00 |
|
Alex S
|
2753285b77
|
config editing through database
|
2020-01-10 15:51:59 +03:00 |
|
Maksim Pechnikov
|
5b84156013
|
moved remote follow in separate controller
|
2019-12-21 21:27:42 +03:00 |
|
Maksim Pechnikov
|
a879c396bb
|
Merge branch 'develop' into feature/tag_feed
|
2019-12-17 09:24:08 +03:00 |
|
Maxim Filippov
|
3ecf131511
|
Merge branch 'develop' into feature/report-notes
|
2019-12-12 02:16:23 +03:00 |
|
Egor Kislitsyn
|
75b419d7c8
|
Do not apply http signature pipeline to the unsubscribe route
|
2019-12-10 22:36:03 +07:00 |
|
Maxim Filippov
|
a7f77785c2
|
Implement report notes destruction
|
2019-12-08 11:27:23 +03:00 |
|
Maksim Pechnikov
|
22fc271e23
|
init tag feed
|
2019-12-06 09:33:40 +03:00 |
|
Maxim Filippov
|
4b60d41db9
|
Add report notes
|
2019-12-04 00:26:37 +09:00 |
|
Maxim Filippov
|
82f4e4760e
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
2019-11-25 01:46:18 +09:00 |
|
Maxim Filippov
|
fd24467b92
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
2019-11-25 01:43:11 +09:00 |
|
lain
|
bd62946020
|
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
|
2019-11-22 15:39:19 +00:00 |
|
Maxim Filippov
|
46eb160135
|
AdminAPI: Confirm user account, resend confirmation email
|
2019-11-19 20:14:02 +09:00 |
|
rinpatch
|
22554ac5ca
|
Merge branch 'bugfix/1395-email-activation' into 'develop'
Bugfix/1395 email activation
Closes #1395
See merge request pleroma/pleroma!1965
|
2019-11-15 14:11:48 +00:00 |
|
lain
|
f17e0f8e4f
|
OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
|
2019-11-15 14:13:21 +01:00 |
|
Maxim Filippov
|
114930b5fd
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
2019-11-14 23:45:29 +09:00 |
|
Maxim Filippov
|
30af5da330
|
Admin API: list all statuses from a given instance
|
2019-11-14 23:44:07 +09:00 |
|
feld
|
1afeaf82fa
|
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
|
2019-11-14 13:35:41 +00:00 |
|
rinpatch
|
6085c71bd1
|
Merge branch 'reactions' into 'develop'
Emoji Reactions
See merge request pleroma/pleroma!1662
|
2019-11-14 08:47:10 +00:00 |
|
Phil Hagelberg
|
dc3b87d153
|
Move static FE routing into its own plug.
Previously it was piggybacking on FallbackRedirectController for users
and OStatusController for notices; now it's all in one place.
|
2019-11-09 18:08:08 -08:00 |
|
lain
|
b22ee9d966
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-11-08 13:27:11 +01:00 |
|
Maxim Filippov
|
b14bf9044f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-11-08 18:30:49 +09:00 |
|
Maxim Filippov
|
43ea16870f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-11-05 02:12:48 +03:00 |
|
Maxim Filippov
|
743b622b7b
|
Force password reset for multiple users
|
2019-11-01 18:45:47 +03:00 |
|
Maksim Pechnikov
|
243719a965
|
Merge branch 'develop' into feature/masto_api_markers
|
2019-10-21 11:32:28 +03:00 |
|
Haelwenn
|
f01dbc450c
|
Merge branch 'feature/mastofe-pwa' into 'develop'
MastoFE: Add PWA manifest.
See merge request pleroma/pleroma!1834
|
2019-10-19 20:11:58 +00:00 |
|
eugenijm
|
52ed2f8f2d
|
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
|
2019-10-19 15:24:06 +03:00 |
|
KokaKiwi
|
638457ba94
|
MastoFE: Add PWA manifest.
|
2019-10-19 12:15:14 +02:00 |
|
Maxim Filippov
|
019147f115
|
Merge branch 'develop' into feature/relay-list
|
2019-10-18 18:35:58 +02:00 |
|
Ariadne Conill
|
beb9861f9d
|
router: disconnect Salmon
|
2019-10-18 14:50:09 +00:00 |
|
Ariadne Conill
|
4f82e42e4e
|
websub: remove entirely
|
2019-10-18 14:50:09 +00:00 |
|
Maxim Filippov
|
2473702be2
|
Merge branch 'develop' into feature/relay-list
|
2019-10-18 10:24:29 +02:00 |
|
Maksim Pechnikov
|
66b5d0ff55
|
add Markers /api/v1/markers
|
2019-10-17 15:26:59 +03:00 |
|
Maxim Filippov
|
cc6875b582
|
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
|
2019-10-11 19:12:29 +03:00 |
|
Maxim Filippov
|
aaa4252f41
|
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
|
2019-10-11 15:58:45 +03:00 |
|
Maxim Filippov
|
f5104f36bb
|
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
|
2019-10-11 00:24:31 +03:00 |
|
Maxim Filippov
|
ad42837244
|
Ability to toggle activation status and permission group for a group of users
|
2019-10-09 17:03:54 +03:00 |
|
Maxim Filippov
|
35068baf65
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-10-07 15:41:41 +03:00 |
|
Maxim Filippov
|
7aceaa517b
|
Admin API: Reports, grouped by status
|
2019-10-07 15:39:07 +03:00 |
|
lain
|
6c278cfe09
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
2019-10-07 12:31:51 +00:00 |
|
Sergey Suprunenko
|
4b3f77a99f
|
Extract RSS Feed functionality from OStatus
|
2019-10-07 12:20:41 +00:00 |
|
lain
|
73b6512907
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-10-07 12:30:59 +02:00 |
|
Ivan Tashkinov
|
b93856874d
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
2019-10-06 17:12:17 +03:00 |
|
lain
|
61097ba6ab
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
2019-10-06 08:11:47 +00:00 |
|
kaniini
|
7a318d74e6
|
Merge branch 'split-masto-api/leftovers' into 'develop'
[#1278] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
|
2019-10-05 19:28:53 +00:00 |
|
lain
|
d9aaea44ff
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-10-05 10:42:29 +02:00 |
|
Maksim Pechnikov
|
83631752af
|
removed legacy api: "/objects/:uuid/likes"
|
2019-10-04 22:35:26 +03:00 |
|
Maxim Filippov
|
8dcc2f9f5e
|
Admin API: Allow changing the state of multiple reports at once
|
2019-10-04 19:00:58 +03:00 |
|
lain
|
4cb603e1df
|
PleromaAPI: Add unreacting.
|
2019-10-02 18:19:16 +02:00 |
|
Egor Kislitsyn
|
e0c68eeb02
|
Move `:favourites` and `:bookmarks` actions to StatusController
|
2019-10-02 21:31:19 +07:00 |
|
Egor Kislitsyn
|
7f2bc57725
|
Move `follows`, `mutes` and `blocks` actions to AccountController
|
2019-10-02 21:22:21 +07:00 |
|
Egor Kislitsyn
|
d3c404af12
|
Add MastoFEController
|
2019-10-02 20:36:08 +07:00 |
|
lain
|
dfe5c958eb
|
ActivityPub: Add undo for emoji reactions.
|
2019-10-02 15:08:20 +02:00 |
|
Egor Kislitsyn
|
1c6e1055c8
|
Add CustomEmojiController
|
2019-10-02 19:16:34 +07:00 |
|
lain
|
557223b2b5
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-10-02 13:27:55 +02:00 |
|
Egor Kislitsyn
|
c8b01f6667
|
Extract instance actions from `MastodonAPIController` to `InstanceController`
|
2019-10-02 14:13:52 +07:00 |
|
Egor Kislitsyn
|
af690d1033
|
Extract auth actions from `MastodonAPIController` to `AuthController`
|
2019-10-01 15:54:45 +07:00 |
|
Egor Kislitsyn
|
2dad6dd020
|
Extract apps actions from `MastodonAPIController` to `AppController`
|
2019-10-01 15:21:46 +07:00 |
|
Egor Kislitsyn
|
39695c4436
|
Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
|
2019-10-01 15:07:49 +07:00 |
|
Egor Kislitsyn
|
585bc57edb
|
Extract media actions from `MastodonAPIController` to `MediaController`
|
2019-10-01 14:36:35 +07:00 |