bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13924 commits 1 branch 0 tags 292 MiB
Commit graph

13924 commits

This branch
This branch
All branches
Author SHA1 Message Date
kPherox
34606d609d
fix: stream out Create Activity 
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3499
 2021-08-13 17:54:51 +02:00
Alex Gleason
caefb0378a
RichMedia.Helpers: fix compile cycle on Application 2021-08-08 11:57:40 -05:00
Alex Gleason
bef32d6e02
MastodonAPI.StatusView: comment out unused build_image_url/2 2021-08-08 11:13:03 -05:00
Alex Gleason
6521155335
NsfwApiPolicy: fix @behaviour 2021-08-08 10:58:40 -05:00
Alex Gleason
93d01bf10c
Soapbox: switch to import Config in config/soapbox.exs 2021-08-08 10:52:20 -05:00
Alex Gleason
90680aad90
Merge tag 'v2.4.0' into pleroma-v2.4.0 2021-08-08 10:46:48 -05:00
Haelwenn
dc63aaf84f Merge branch 'release/2.4.0' into 'stable' 
Release/2.4.0

See merge request pleroma/pleroma!3493
 2021-08-08 14:37:15 +00:00
Haelwenn (lanodan) Monnier
0910777d41
Update PleromaFE Bundle (2.4.0) 
based on 51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9
 2021-08-08 15:21:21 +02:00
matildepark
469405b7b2
CHANGELOG.md: Fix instances of 2020 being actually 2021 2021-08-06 08:42:27 +02:00
Alex Gleason
5dddc6166a Merge branch 'revert-b478a87e' into 'develop' 
Revert "Merge branch 'non-rfc-status-codes' into 'develop'"

See merge request soapbox-pub/soapbox!48
 2021-08-05 19:28:18 +00:00
Alex Gleason
23dfbf1c7e Revert "Merge branch 'non-rfc-status-codes' into 'develop'" 
This reverts merge request !47
 2021-08-05 19:16:11 +00:00
Haelwenn (lanodan) Monnier
79e993cae5
Release 2.4.0 2021-08-01 08:26:39 +02:00
Haelwenn (lanodan) Monnier
5f8a9b671f
Update AdminFE bundle 2021-08-01 08:26:39 +02:00
feld
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
feld
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
b478a87e96 Merge branch 'non-rfc-status-codes' into 'develop' 
Soapbox: support Cloudflare status codes

See merge request soapbox-pub/soapbox!47
 2021-07-27 14:48:52 +00:00
Alex Gleason
b726efef41
Soapbox: support Cloudflare status codes 2021-07-27 09:36:09 -05:00
Alex Gleason
c51204fa07 Merge branch 'object-tombstone-visibility' into 'develop' 
Visibility: check Tombstone objects in visible_for_user?/2

See merge request soapbox-pub/soapbox!46
 2021-07-27 14:13:29 +00:00
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
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
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