Maksim Pechnikov
|
ed3bc53fa1
|
Merge branch 'develop' into issue/2099
|
4 years ago |
|
Maksim Pechnikov
|
2ec0dcf001
|
Merge branch 'develop' into issue/2099
|
4 years ago |
|
Ivan Tashkinov
|
a428800405
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Ivan Tashkinov
|
d9fb5bc08a
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
|
4 years ago |
|
eugenijm
|
582ad5d4e1
|
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
|
4 years ago |
|
Alex Gleason
|
9dd0b23da4
|
AdminAPI: show chat
|
4 years ago |
|
Alex Gleason
|
f13b52a703
|
AdminAPI: list messages in a chat
|
4 years ago |
|
Alex Gleason
|
fb0de07343
|
AdminAPI: list chats for a user
|
4 years ago |
|
Alex Gleason
|
b40a627ab0
|
AdminAPI: delete a chat message
|
4 years ago |
|
Maksim Pechnikov
|
5ae56aafb2
|
added import mutes
|
4 years ago |
|
Maksim Pechnikov
|
7794d7c694
|
added Pleroma.Web.PleromaAPI.EmojiFileController
|
4 years ago |
|
Ivan Tashkinov
|
1298a2ea2c
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# mix.lock
|
4 years ago |
|
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
|
4 years ago |
|
Alex Gleason
|
20d24741af
|
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint
|
4 years ago |
|
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
|
4 years ago |
|
lain
|
c8dd973af5
|
AccountController: Remove unused `update_?` routes.
These were not documented and are also not used anymore.
|
4 years ago |
|
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
|
4 years ago |
|
Egor Kislitsyn
|
67d92ac7b7
|
Remove `/statusnet/config`
|
4 years ago |
|
Egor Kislitsyn
|
4a306720e8
|
Merge branch 'develop' into remove-twitter-api
|
4 years ago |
|
feld
|
8288419686
|
Merge branch 'preload-data' into 'develop'
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
8f6ba4b22f
|
Add warning against parsing/reusing MastoFE settings blob
|
4 years ago |
|
Mark Felder
|
26f710b9e3
|
Merge branch 'develop' into preload-data
|
4 years ago |
|
Maksim Pechnikov
|
f9dcf15ecb
|
added admin api for MediaProxy cache invalidation
|
4 years ago |
|
lain
|
064c4f86f3
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
d192492658
|
Merge branch 'openapi/admin/relay' into 'develop'
Add OpenAPI spec for AdminAPI.RelayController
See merge request pleroma/pleroma!2579
|
4 years ago |
|
lain
|
7d66dd180a
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
a8ca030d85
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
Haelwenn
|
d74985af23
|
Merge branch 'features/apc2s-pagination' into 'develop'
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
|
4 years ago |
|
minibikini
|
b57e4ad1ab
|
Merge branch 'develop' into 'openapi/admin/relay'
# Conflicts:
# lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
|
4 years ago |
|
Egor Kislitsyn
|
70f054b083
|
Merge branch 'develop' into openapi/admin/relay
|
4 years ago |
|
Egor Kislitsyn
|
b4d5bdd6f1
|
Merge branch 'develop' into openapi/admin/config
|
4 years ago |
|
stwf
|
29ae5bb771
|
preload data into index.html
|
4 years ago |
|
lain
|
b3407344d3
|
ChatController: Add function to mark single message as read.
|
4 years ago |
|
Egor Kislitsyn
|
9d572f2f66
|
Move report actions to AdminAPI.ReportController
|
4 years ago |
|
Egor Kislitsyn
|
68cb152a08
|
Merge branch 'develop' into openapi/admin/relay
|
4 years ago |
|
lain
|
5da38c15cd
|
Merge branch 'openapi/admin/oauth-apps' into 'develop'
Add OpenAPI spec for AdminAPI.OAuthAppContoller
See merge request pleroma/pleroma!2582
|
4 years ago |
|
lain
|
022d975a39
|
Merge branch 'openapi/admin/invites' into 'develop'
Add OpenAPI spec for AdminAPI.InviteController
See merge request pleroma/pleroma!2585
|
4 years ago |
|
Egor Kislitsyn
|
6b84c62d4a
|
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
2c18830d0d
|
Bugfix: router: allow basic_auth for outbox
|
4 years ago |
|
Egor Kislitsyn
|
d1ee3527ef
|
Move config actions to AdminAPI.ConfigController
|
4 years ago |
|
Egor Kislitsyn
|
fca48154a2
|
Add AdminAPI.InviteView
|
4 years ago |
|
Egor Kislitsyn
|
95ebfb9190
|
Move invite actions to AdminAPI.InviteTokenController
|
4 years ago |
|
Egor Kislitsyn
|
0ba1f2631a
|
Add OpenAPI spec for AdminAPI.OAuthAppContoller
|
4 years ago |
|
Egor Kislitsyn
|
cbcd592300
|
Add OpenAPI spec for AdminAPI.RelayController
|
4 years ago |
|
lain
|
ee35bb5ac2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
ec470c4c77
|
Merge branch 'openapi/admin/status' into 'develop'
Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566
|
4 years ago |
|
lain
|
355aa3bdc7
|
ActivityPubController: Add Mastodon activity compat route.
|
4 years ago |
|
lain
|
ca755f9a73
|
ActivityPubController: Add Mastodon compatibility route.
|
4 years ago |
|
lain
|
578ed3a37f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
f166316f50
|
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
|
4 years ago |
|
lain
|
814c3e5171
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
Egor Kislitsyn
|
9de9760aa6
|
Move status actions to AdminAPI.StatusController
|
4 years ago |
|
Ivan Tashkinov
|
6fd4f58ead
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
|
4 years ago |
|
lain
|
265746b21f
|
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549
|
4 years ago |
|
Egor Kislitsyn
|
5ba6e1c322
|
Move notification actions to PleromaAPI.NotificationController
|
4 years ago |
|
Egor Kislitsyn
|
f3fc8b22b1
|
Move conversation actions to PleromaAPI.ConversationController
|
4 years ago |
|
Egor Kislitsyn
|
9a5de0f454
|
Move reaction actions to EmojiReactionController
|
4 years ago |
|
Egor Kislitsyn
|
524d04d921
|
Add OpenAPI spec for PleromaAPI.ScrobbleController
|
4 years ago |
|
Egor Kislitsyn
|
aef31c69df
|
Rename EmojiAPIController to EmojiPackController
|
4 years ago |
|
Egor Kislitsyn
|
6e4de715b3
|
Add OpenAPI spec for PleromaAPI.EmojiAPIController
|
4 years ago |
|
lain
|
9c17109765
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
d15aa9d950
|
Merge branch 'develop' into 'remove-twitter-api'
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
cb363f0183
|
MastodonAPI: /api/v2/media endpoints
|
4 years ago |
|
lain
|
b5aa204eb8
|
ChatController: Support deletion of chat messages.
|
4 years ago |
|
lain
|
8d5597ff68
|
ChatController: Add GET /chats/:id
|
4 years ago |
|
Ivan Tashkinov
|
bbdad85568
|
Initial implementation of image preview proxy. Media proxy tests refactoring.
|
4 years ago |
|
lain
|
fb2d284d28
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
Maksim
|
3d0c567fbc
|
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
|
4 years ago |
|
lain
|
205313e541
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
a716543267
|
Merge branch 'openapi/subscriptions' into 'develop'
Add OpenAPI spec for SubscriptionController
See merge request pleroma/pleroma!2444
|
4 years ago |
|
Alexander Strizhakov
|
e7d8ab8303
|
admin_api fetch status by id
|
4 years ago |
|
Egor Kislitsyn
|
d861b0790a
|
Add OpenAPI spec for SubscriptionController
|
4 years ago |
|
lain
|
b04328c3de
|
ChatController: Add mark_as_read
|
4 years ago |
|
lain
|
c40afe5ba0
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
Ivan Tashkinov
|
2d07ed7747
|
[#1732] Made AP C2S :followers and :following endpoints serve on no auth
(as for related :api pipeline endpoints).
|
4 years ago |
|
lain
|
3370bb0e46
|
Merge branch 'openapi/notifications' into 'develop'
Add OpenAPI spec for NotificationController
See merge request pleroma/pleroma!2437
|
4 years ago |
|
Alexander Strizhakov
|
ddb757f743
|
emoji api packs changes in routes with docs update
|
4 years ago |
|
Alexander Strizhakov
|
342f55fb92
|
refactor emoji api with fixes
|
4 years ago |
|
Egor Kislitsyn
|
9c1adb35de
|
Merge branch 'develop' into openapi/notifications
|
4 years ago |
|
lain
|
0c491b904d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
Egor Kislitsyn
|
5238ae3dd3
|
Add OpenAPI spec for NotificationController
|
4 years ago |
|
lain
|
ad82a216ff
|
Chat API: Align more to Pleroma/Mastodon API.
|
4 years ago |
|
Ivan Tashkinov
|
b4139cc547
|
[#2409] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.
|
4 years ago |
|
Ivan Tashkinov
|
00e62161f6
|
[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
|
4 years ago |
|
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.
|
4 years ago |
|
Ivan Tashkinov
|
f685cbd309
|
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
|
4 years ago |
|
lain
|
5165287ff4
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
Egor Kislitsyn
|
258d897579
|
Cleanup and DRY the Router
|
4 years ago |
|
lain
|
8c2c325598
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
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
|
4 years ago |
|
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
|
4 years ago |
|
Alexander Strizhakov
|
72ef6cc4f2
|
added need_reboot endpoint to admin api
|
5 years ago |
|
Ivan Tashkinov
|
bde1189c34
|
[#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
|
5 years ago |
|
Ivan Tashkinov
|
bedf92e064
|
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
|
5 years ago |
|
lain
|
44bfb491ea
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
5 years ago |
|
lain
|
2cc6841424
|
ChatController: Basic message posting.
|
5 years ago |
|
lain
|
e8fd0dd689
|
ChatController: Basic support for returning messages.
|
5 years ago |
|
lain
|
68abea313d
|
ChatController: Add creation and return of chats.
|
5 years ago |
|
Egor Kislitsyn
|
d545b883eb
|
Add `/api/v1/notifications/:id/dismiss` endpoint
|
5 years ago |
|
Ivan Tashkinov
|
fc81e5a49c
|
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
|
5 years ago |
