Haelwenn
|
93f12c0d0d
|
Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'
Synchronized settings for apps (frontends)
See merge request pleroma/pleroma!3698
|
2022-08-12 01:34:36 +00:00 |
|
tusooa
|
c80096522c
|
Merge branch 'develop' into 'from/develop/tusooa/emit-move'
# Conflicts:
# CHANGELOG.md
# test/pleroma/user_test.exs
|
2022-07-31 21:32:49 +00:00 |
|
Sean King
|
64e16e6a4b
|
Document way to do notice compatibility routes with Nginx reverse-proxy instead
|
2022-07-16 23:44:37 -06:00 |
|
Tusooa Zhu
|
8371fd8ca2
|
Implement settings api
|
2022-07-16 01:20:25 -04:00 |
|
Tusooa Zhu
|
7d1dae3bef
|
Restrict mastodon api announcements to logged-in users only
|
2022-04-02 02:25:13 -04:00 |
|
Tusooa Zhu
|
11a1996bf5
|
Implement update announcement admin api
|
2022-03-08 20:55:41 -05:00 |
|
Tusooa Zhu
|
881179ec72
|
Remove GET /api/v1/announcements/:id
|
2022-03-08 19:22:28 -05:00 |
|
Tusooa Zhu
|
5169ad8f14
|
Implement announcement read relationships
|
2022-03-08 13:09:49 -05:00 |
|
Tusooa Zhu
|
d7af67012f
|
Implement first pass of announcement admin api
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/2836
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/1470
|
2022-03-08 01:01:27 -05:00 |
|
Sean King
|
17aa3644be
|
Copyright bump for 2022
|
2022-02-25 23:11:42 -07:00 |
|
marcin mikołajczak
|
0266bc3c96
|
Birthdays: hide_birthday -> show_birthday
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-23 09:13:33 +01:00 |
|
marcin mikołajczak
|
b108b05650
|
Birth dates, birthday reminders API, allow instance admins to require minimum age
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-18 14:57:48 +01:00 |
|
marcin mikołajczak
|
4f249b2397
|
Merge remote-tracking branch 'origin/develop' into account-endorsements
|
2022-01-10 20:04:14 +01:00 |
|
marcin mikołajczak
|
9032d065e6
|
wip
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 18:07:19 +01: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 |
|
Tusooa Zhu
|
54d7b4354c
|
Add deleting alias endpoint
Ref: emit-move
|
2021-12-28 01:11:08 -05:00 |
|
Tusooa Zhu
|
c1aa3c98ac
|
Add get and add aliases endpoints
Ref: emit-move
|
2021-12-28 01:11:08 -05:00 |
|
Tusooa Zhu
|
0af77b20c1
|
Implement moving account
Ref: emit-move
|
2021-12-28 01:10:34 -05: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 |
|
Alibek Omarov
|
f02715c4b2
|
Fix lint errors
|
2021-12-27 03:42:03 +03:00 |
|
Alibek Omarov
|
f66675f349
|
API: fix duplicate :get_password_token route
|
2021-12-27 02:57:54 +03:00 |
|
Alibek Omarov
|
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 |
|
marcin mikołajczak
|
a9b0027071
|
Account endorsements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-29 12:44:57 +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 |
|