|
|
69ebfb29fb
|
Update dev.exs error message to write to stderr. Currently it dumps this message at the beginnig of the file when using vim-autoformat with mix format
|
2021-07-27 20:41:36 +00:00 |
|
|
|
d8a986c9e8
|
Merge branch 'object-tombstone-visibility' into 'develop'
Visibility: check Tombstone objects in visible_for_user?/2
See merge request pleroma/pleroma!3490
|
2021-07-27 16:25:34 +00:00 |
|
|
|
7495beeb40
|
Merge branch 'errorview-json-fix' into 'develop'
Fix errors in ErrorView
See merge request pleroma/pleroma!3489
|
2021-07-27 16:24:53 +00: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
|
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 |
|
sadposter
|
de69585eaa
|
:Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-07-23 09:57:26 +01: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
|
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
|
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
|
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
|
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 |
|
|
|
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 |
|
|
|
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
|
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
|
167e14416b
|
AdminAPI: add date to users
|
2021-07-14 08:54:59 -05: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
|
5e88796784
|
AdminAPI: sort user results by ID descending
|
2021-07-13 22:47:02 -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
|
e40b58fd56
|
Merge remote-tracking branch 'pleroma/develop' into fix-object-deletion-timeout
|
2021-07-12 16:23:06 -05:00 |
|
Alex Gleason
|
9a0cb34c8c
|
Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted
|
2021-07-12 16:20:15 -05:00 |
|
Haelwenn
|
173e977e28
|
Merge branch 'features/ingestion-page' into 'develop'
Pipeline Ingestion: Page
See merge request pleroma/pleroma!3097
|
2021-07-12 05:05:49 +00:00 |
|
Haelwenn
|
ebcc28fef0
|
Merge branch 'features/validators-apc2s' into 'develop'
AP C2S: Remove restrictions and make it go through pipeline
See merge request pleroma/pleroma!3203
|
2021-07-12 05:01:36 +00:00 |
|
Haelwenn (lanodan) Monnier
|
6dc78f5f6f
|
AP C2S: Remove restrictions and make it go through pipeline
|
2021-07-12 06:49:41 +02:00 |
|
Sean King
|
9758f636b2
|
Delete MastoFE Controller Test
|
2021-07-10 11:13:25 -06:00 |
|
Sean King
|
5d279a22b1
|
Merge develop branch upstream
|
2021-07-10 11:04:16 -06:00 |
|
|
|
aa9a6c3c05
|
Merge branch 'update/linkify' into 'develop'
Update Linkify
See merge request pleroma/pleroma!3478
|
2021-07-08 17:44:52 +00:00 |
|
|
|
64d009693e
|
Update Linkify to fix crash on posts with a URL we failed to parse correctly
|
2021-07-08 12:33:17 -05:00 |
|
|
|
9e1da4bf58
|
Merge branch 'remote-deletions' into 'develop'
Fix user deletion problems
See merge request pleroma/pleroma!3476
|
2021-07-06 20:05:05 +00:00 |
|
marcin mikołajczak
|
6ef8e1776d
|
fix the fucking list timelines on mastofe/soapbox-fe
|
2021-07-02 13:03:41 +00:00 |
|
Alex Gleason
|
310ef6b70d
|
Deletions: change User.purge/1 to defp, add CHANGELOG entry
|
2021-06-30 12:25:20 -05:00 |
|
Alex Gleason
|
99cc26bb02
|
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
|
2021-06-30 02:02:30 -05:00 |
|
Alex Gleason
|
beb1c98ab5
|
Deletions: don't purge keys so Delete/Undo activities can be signed
|
2021-06-30 02:02:24 -05:00 |
|
Alex Gleason
|
43800d83f4
|
Deletions: allow deactivated users to be deleted
|
2021-06-30 01:32:28 -05:00 |
|
