Alex Gleason
|
9738a993d2
|
Merge remote-tracking branch 'origin/develop' into object-tombstone-visibility
|
2021-07-27 08:58:58 -05:00 |
|
Alex Gleason
|
7f23dd6cc8
|
Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility
|
2021-07-27 08:54:26 -05:00 |
|
Alex Gleason
|
9cc8642b80
|
Visibility: check Tombstone objects in visible_for_user?/2
|
2021-07-27 08:54:01 -05:00 |
|
Alex Gleason
|
5100ab0f3f
|
Merge branch 'errorview-json-fix' into 'develop'
Add activity+json to Phoenix :format_encoders
See merge request soapbox-pub/soapbox!45
|
2021-07-27 13:52:26 +00:00 |
|
Alex Gleason
|
f709d9d106
|
Merge remote-tracking branch 'origin/develop' into errorview-json-fix
|
2021-07-27 08:39:48 -05:00 |
|
Alex Gleason
|
3d8ce61fe5
|
CHANGELOG: fixed JSON error rendering
|
2021-07-27 08:30:38 -05:00 |
|
Alex Gleason
|
33a19c002a
|
Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix
|
2021-07-27 08:29:53 -05:00 |
|
Alex Gleason
|
94db0b7cd6
|
Add activity+json to Phoenix :format_encoders
Fixes ErrorView rendering
|
2021-07-27 08:28:52 -05:00 |
|
Haelwenn
|
7acdab1f30
|
Merge branch 'mkljczk-develop-patch-60115' into 'develop'
MastodonAPI: Fix list timelines
Closes mastofe#89 and #2693
See merge request pleroma/pleroma!3477
|
2021-07-22 18:41:11 +00:00 |
|
Alex Gleason
|
060ee788d2
|
Merge branch 'instance-deletion' into 'develop'
AdminAPI: endpoint to delete all content from a remote instance
See merge request soapbox-pub/soapbox!42
|
2021-07-18 17:31:38 +00:00 |
|
Alex Gleason
|
85d71d4f1d
|
CHANGELOG: Support poll notification type
|
2021-07-18 11:49:25 -05:00 |
|
Alex Gleason
|
62bf6d67e3
|
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
|
2021-07-18 11:49:22 -05:00 |
|
Alex Gleason
|
7ca3c1de22
|
Merge branch 'poll-notification-fixes' into 'develop'
Poll notification fixes
See merge request soapbox-pub/soapbox!44
|
2021-07-18 16:39:20 +00:00 |
|
Alex Gleason
|
9467b8b6ca
|
Merge remote-tracking branch 'origin/develop' into poll-notification-fixes
|
2021-07-18 11:10:29 -05:00 |
|
Alex Gleason
|
70f1496eb8
|
Poll notification: only notify local users
|
2021-07-18 11:10:23 -05:00 |
|
Alex Gleason
|
0b1c05ca1e
|
Poll notification: trigger PollWorker through common_pipeline
|
2021-07-18 11:10:23 -05:00 |
|
Alex Gleason
|
6a6e42c9bf
|
PollWorker defensive checks
|
2021-07-18 11:10:22 -05:00 |
|
Alex Gleason
|
cbd1a10c16
|
Poll notification: notify for polls even when block_from_strangers is set
|
2021-07-18 11:10:04 -05:00 |
|
Alex Gleason
|
2e3446d7de
|
Merge branch 'poll-notification' into 'develop'
MastodonAPI: Support poll notification
See merge request soapbox-pub/soapbox!43
|
2021-07-18 03:42:29 +00:00 |
|
Alex Gleason
|
d3df5b0841
|
Merge remote-tracking branch 'origin/develop' into poll-notification
|
2021-07-17 22:25:35 -05:00 |
|
Alex Gleason
|
0114754db2
|
MastodonAPI: Support poll notification
|
2021-07-17 22:19:38 -05:00 |
|
Alex Gleason
|
c4efe0d2d6
|
CHANGELOG: instance deletion
|
2021-07-17 15:05:20 -05:00 |
|
Alex Gleason
|
3674179b26
|
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
|
2021-07-17 15:03:43 -05:00 |
|
Alex Gleason
|
c369f52b4a
|
Merge remote-tracking branch 'origin/develop' into instance-deletion
|
2021-07-17 15:00:53 -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
|
f67d00d12b
|
Add Instance.delete_users_and_activities/1 to delete all content from a remote instance
|
2021-07-17 14:06:35 -05:00 |
|
Alex Gleason
|
c136dc0987
|
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
|
2021-07-17 13:53:19 -05:00 |
|
Alex Gleason
|
25676c84be
|
Create AdminAPI.InstanceController
|
2021-07-17 13:05:25 -05:00 |
|
feld
|
3f58213646
|
Merge branch 'admin-api-users-sort' into 'develop'
AdminAPI: sort new users at the top
Closes #2709
See merge request pleroma/pleroma!3481
|
2021-07-14 14:39:14 +00:00 |
|
feld
|
17d79f3484
|
Merge branch 'admin-api-users-date' into 'develop'
AdminAPI: add created_at date to users
See merge request pleroma/pleroma!3482
|
2021-07-14 14:35:21 +00:00 |
|
Alex Gleason
|
deb245414f
|
Merge branch 'admin-api-users-date' into 'develop'
AdminAPI: add date to users
See merge request soapbox-pub/soapbox!41
|
2021-07-14 14:12:16 +00:00 |
|
Alex Gleason
|
117b3edf54
|
CHANGELOG: AdminAPI return date with users
|
2021-07-14 09:03:44 -05:00 |
|
Alex Gleason
|
1a2fe96d56
|
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date
|
2021-07-14 09:02:55 -05:00 |
|
Alex Gleason
|
c2d9a7fd02
|
Merge remote-tracking branch 'origin/develop' into admin-api-users-date
|
2021-07-14 08:56:52 -05:00 |
|
Alex Gleason
|
167e14416b
|
AdminAPI: add date to users
|
2021-07-14 08:54:59 -05:00 |
|
Alex Gleason
|
453bdf4084
|
Merge branch 'admin-api-users-sort' into 'develop'
AdminAPI: sort user results by ID descending
See merge request soapbox-pub/soapbox!40
|
2021-07-14 03:59:59 +00:00 |
|
Alex Gleason
|
5681a007d7
|
CHANGELOG: AdminAPI users sort
|
2021-07-13 22:48:32 -05:00 |
|
Alex Gleason
|
deb3f91136
|
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
|
2021-07-13 22:47:47 -05:00 |
|
Alex Gleason
|
4e38957a0e
|
Merge remote-tracking branch 'origin/develop' into admin-api-users-sort
|
2021-07-13 22:47:23 -05:00 |
|
Alex Gleason
|
5e88796784
|
AdminAPI: sort user results by ID descending
|
2021-07-13 22:47:02 -05:00 |
|
Alex Gleason
|
6dad0310f3
|
Merge branch 'moderators' into 'develop'
AdminAPI: let moderators actually do things
See merge request soapbox-pub/soapbox!39
|
2021-07-13 03:53:35 +00:00 |
|
Alex Gleason
|
84c9feb2e1
|
Merge remote-tracking branch 'origin/develop' into moderators
|
2021-07-12 22:36:02 -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 |
|
Alex Gleason
|
9bc1e79c56
|
Moderators: add UserIsStaffPlug
|
2021-07-12 21:57:52 -05:00 |
|
Alex Gleason
|
65514484cc
|
CHANGELOG: fixed user deletion database timeout
|
2021-07-12 16:59:54 -05:00 |
|
Alex Gleason
|
e8e9c7de19
|
Merge branch 'fix-object-deletion-timeout' into 'develop'
Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted
See merge request soapbox-pub/soapbox!38
|
2021-07-12 21:33:43 +00:00 |
|
Alex Gleason
|
e40b58fd56
|
Merge remote-tracking branch 'pleroma/develop' into fix-object-deletion-timeout
|
2021-07-12 16:23:06 -05:00 |
|