|
|
0d012ebea1
|
Revert "Merge branch 'remove/mastofe' into 'develop'"
This reverts commit 6b3842cf50, reversing
changes made to 6b1282a829.
|
2022-01-08 21:44:37 +00:00 |
|
marcin mikołajczak
|
746c9daa62
|
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 16:27:27 +01:00 |
|
marcin mikołajczak
|
f734579965
|
MastoAPI: Add GET /api/v1/accounts/lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 16:11:17 +01:00 |
|
Alex Gleason
|
f5c3d45120
|
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
|
2021-12-27 18:01:25 -06:00 |
|
Alex Gleason
|
a3fa987611
|
AdminAPI: fix duplicated routes
|
2021-12-27 16:58:10 -06:00 |
|
|
|
f02715c4b2
|
Fix lint errors
|
2021-12-27 03:42:03 +03:00 |
|
|
|
f66675f349
|
API: fix duplicate :get_password_token route
|
2021-12-27 02:57:54 +03:00 |
|
|
|
cd1041c3a4
|
API: optionally restrict moderators from accessing sensitive data
|
2021-12-27 02:27:48 +03:00 |
|
Alex Gleason
|
913141379c
|
Merge branch 'profile-directory' into 'develop'
MastoAPI: Profile directory
See merge request pleroma/pleroma!3573
|
2021-12-26 02:35:17 +00:00 |
|
marcin mikołajczak
|
de006443f0
|
MastoAPI: Profile directory
|
2021-12-26 02:35:17 +00:00 |
|
Alex Gleason
|
db2bf55e9b
|
Merge remote-tracking branch 'origin/develop' into notice-routes
|
2021-12-25 19:57:53 -06:00 |
|
Alex Gleason
|
73609211a4
|
Merge branch 'account-notes' into 'develop'
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
|
2021-12-25 01:41:12 +00:00 |
|
marcin mikołajczak
|
9775955974
|
Merge remote-tracking branch 'origin/develop' into remote-follow-api
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-25 00:52:02 +01:00 |
|
Alex Gleason
|
3f8fc34593
|
Merge remote-tracking branch 'origin/develop' into moderators
|
2021-12-19 12:55:36 -06:00 |
|
Alex Gleason
|
b0d2b53934
|
Merge branch 'manifest' into 'develop'
Expose /manifest.json for PWA
Closes #882
See merge request pleroma/pleroma!3544
|
2021-12-19 18:18:59 +00:00 |
|
Alex Gleason
|
1ff9ffed83
|
Merge branch 'live-dashboard' into 'develop'
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
|
2021-12-19 17:35:14 +00:00 |
|
Alex Gleason
|
e4f9cb1c1b
|
Merge remote-tracking branch 'origin/develop' into manifest
|
2021-12-19 11:33:10 -06:00 |
|
Alex Gleason
|
bd853199d9
|
Merge branch 'v2-suggestions' into 'develop'
V2 suggestions
See merge request pleroma/pleroma!3547
|
2021-12-19 17:31:17 +00:00 |
|
Alex Gleason
|
e1b89fe3aa
|
Merge remote-tracking branch 'origin/develop' into live-dashboard
|
2021-12-15 19:05:36 -05:00 |
|
Alex Gleason
|
29d80b39f2
|
Add Phoenix LiveDashboard
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
|
2021-12-15 19:05:27 -05:00 |
|
Alex Gleason
|
8286ceb465
|
Merge remote-tracking branch 'origin/develop' into password-reset
|
2021-12-03 00:11:38 -06:00 |
|
Alex Gleason
|
5da4f33bf1
|
Restore POST /auth/password
|
2021-12-03 00:10:57 -06:00 |
|
marcin mikołajczak
|
cd5fb84b76
|
remote_interaction API endpoint
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-02 16:08:44 +01:00 |
|
Alex Gleason
|
aee55b9a8b
|
v2 Suggestions: dismiss a suggestion
|
2021-11-26 20:19:29 -06:00 |
|
Alex Gleason
|
6c0484d571
|
AdminAPI: suggest a user through the API
|
2021-11-26 15:19:01 -06:00 |
|
Alex Gleason
|
7e1caddc58
|
v2 Suggestions: return empty array
|
2021-11-25 14:57:36 -06:00 |
|
Alex Gleason
|
720198d569
|
Merge remote-tracking branch 'pleroma/develop' into manifest
|
2021-11-24 17:58:58 -06:00 |
|
Alex Gleason
|
cb9359335f
|
Expose /manifest.json for PWA
|
2021-11-24 17:50:55 -06:00 |
|
marcin mikołajczak
|
40414bf177
|
MastoAPI: Add user notes on accounts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 16:56:26 +01:00 |
|
lain
|
6e3df11693
|
Merge branch 'instance-deletion' into 'develop'
AdminAPI: endpoint to delete all content from a remote instance
See merge request pleroma/pleroma!3483
|
2021-11-15 14:24:13 +00:00 |
|
Sean King
|
a14e1c0003
|
Move GET /api/v1/apps to GET /api/v1/pleroma/apps
|
2021-08-28 18:02:36 -06:00 |
|
Sean King
|
6519732045
|
GET /api/v1/apps endpoint
|
2021-08-25 21:01:04 -06:00 |
|
Sean King
|
1841bd8383
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
|
2021-08-06 08:08:20 -06:00 |
|
Alex Gleason
|
b83758bd96
|
Merge remote-tracking branch 'pleroma/develop' into moderators
|
2021-08-05 11:11:24 -05:00 |
|
Alex Gleason
|
44ede0657f
|
Merge remote-tracking branch 'pleroma/develop' into staff-plug
|
2021-08-04 11:48:57 -05:00 |
|
Alex Gleason
|
3674179b26
|
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
|
2021-07-17 15:03:43 -05:00 |
|
Alex Gleason
|
bad79f79e6
|
AdminAPI.InstanceController: clean up tests, rename actions
|
2021-07-17 15:00:15 -05:00 |
|
Alex Gleason
|
54dbcfe02a
|
AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance
|
2021-07-17 14:55:05 -05:00 |
|
Alex Gleason
|
25676c84be
|
Create AdminAPI.InstanceController
|
2021-07-17 13:05:25 -05:00 |
|
Alex Gleason
|
2b3d7794b2
|
AdminAPI: let moderators actually do things
|
2021-07-12 22:26:04 -05:00 |
|
Alex Gleason
|
4fe9a758f9
|
Let moderators manage custom emojis
|
2021-07-12 22:11:38 -05:00 |
|
Alex Gleason
|
1f093cb216
|
Moderators: reorganize :admin_api pipeline in Router
|
2021-07-12 22:11:32 -05:00 |
|
Sean King
|
dc4814f0cd
|
Fix merge conflicts with upstream
|
2021-06-04 14:42:44 -06:00 |
|
Haelwenn
|
0c56f9de0d
|
Merge branch 'tests/openapi-everywhere' into 'develop'
Put OpenAPI ~everywhere in tests
See merge request pleroma/pleroma!3324
|
2021-06-04 18:53:09 +00:00 |
|
Alex Gleason
|
39127f15eb
|
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
|
2021-05-28 13:51:21 -05:00 |
|
Alex Gleason
|
c23b81e399
|
Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
Reduce recompilation time by breaking compile-time cycles
|
2021-05-28 13:51:01 -05:00 |
|
|
|
7ad87571bd
|
Merge branch 'cycles-router' into 'develop'
Recompilation speedup: move StaticFEPlug to a pipeline
See merge request pleroma/pleroma!3417
|
2021-05-28 18:24:33 +00:00 |
|
Alex Gleason
|
bf2ee12fdb
|
Merge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxy
|
2021-05-28 13:08:23 -05:00 |
|
Alex Gleason
|
fda34591ce
|
Don't make MediaProxy be a compile-dep of Router
Speeds up recompilation by removing MediaProxy as a compile-time dep of Router
|
2021-05-28 13:07:34 -05:00 |
|
Alex Gleason
|
e885b49e35
|
Merge remote-tracking branch 'pleroma/develop' into cycles-router
|
2021-05-28 12:44:16 -05:00 |
|
