|
|
190fe4347e
|
Display reposted replies with exclude_replies: true
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-03-15 20:24:11 +01:00 |
|
Alex Gleason
|
648773c0b7
|
Merge branch 'uploads-fix' into 'develop'
Sanitize filenames when uploading
See merge request soapbox-pub/rebased!239
|
2023-03-08 17:46:55 +00:00 |
|
tusooa
|
3801c47aaa
|
Sanitize filenames when uploading
|
2023-03-08 11:37:09 -06:00 |
|
Alex Gleason
|
4c0ab884b9
|
Merge branch 'summary' into 'develop'
Add a Gitbook-ish SUMMARY.md
See merge request soapbox-pub/rebased!234
|
2023-02-04 22:45:34 +00:00 |
|
Alex Gleason
|
d3bbb0fdd7
|
Add a Gitbook-ish SUMMARY.md
|
2023-02-04 16:43:17 -06:00 |
|
marcin mikołajczak
|
c6c724cea1
|
Merge branch 'merge-pleroma' into 'develop'
merge pleroma
See merge request soapbox-pub/rebased!229
|
2023-02-04 22:39:35 +00:00 |
|
|
|
830d7c1d58
|
Let moderators do things
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-02-04 23:23:07 +01:00 |
|
|
|
83bdebcaea
|
Do not expose privileges for other users
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-02-02 21:30:38 +01:00 |
|
Alex Gleason
|
75fee84600
|
Merge branch 'rich-media-ua' into 'develop'
Use WhatsApp user-agent for rich media by default
See merge request soapbox-pub/rebased!233
|
2023-01-22 00:08:44 +00:00 |
|
Alex Gleason
|
e8f414b3d0
|
Use WhatsApp user-agent for rich media by default
Related https://gitlab.com/soapbox-pub/rebased/-/issues/180
|
2023-01-21 18:05:53 -06:00 |
|
marcin mikołajczak
|
0d08f049e9
|
Merge branch 'internal-webhooks' into 'develop'
Add internal (not managable from API) webhooks
See merge request soapbox-pub/rebased!197
|
2023-01-11 17:32:25 +00:00 |
|
marcin mikołajczak
|
9e3468c833
|
Merge branch 'develop' into 'internal-webhooks'
# Conflicts:
# lib/pleroma/webhook.ex
|
2023-01-11 09:58:50 +00:00 |
|
|
|
a9e3ff9af9
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2023-01-10 13:39:39 +01:00 |
|
lain
|
2a244b391d
|
Merge branch '2768-strip-location' into 'develop'
Resolve "Exiftool may conflict with SVG files"
Closes #2768
See merge request pleroma/pleroma!3829
|
2023-01-05 16:50:02 +00:00 |
|
Lain Soykaf
|
fe00fbfd54
|
B StripLocation: Add test, work for all svgs.
|
2023-01-05 11:29:06 -05:00 |
|
Dmytro Poltavchenko
|
5b4962165e
|
Added SVG to formats not compatible with exiftool
|
2023-01-05 11:26:57 -05:00 |
|
lain
|
51b4513258
|
Merge branch 'tusooa/earmark' into 'develop'
Bump earmark to 1.4.~34~22
Closes #3033
See merge request pleroma/pleroma!3820
|
2023-01-03 22:10:28 +00:00 |
|
lain
|
a0cdc4cf9e
|
Merge branch 'revert-0fe3f749' into 'develop'
Revert "Merge branch 'copyright-bump' into 'develop'"
See merge request pleroma/pleroma!3826
|
2023-01-02 21:06:52 +00:00 |
|
lain
|
e853cfe7c3
|
Revert "Merge branch 'copyright-bump' into 'develop'"
This reverts merge request !3825
|
2023-01-02 20:38:50 +00:00 |
|
Haelwenn
|
0fe3f749ea
|
Merge branch 'copyright-bump' into 'develop'
Bump copyright year
See merge request pleroma/pleroma!3825
|
2023-01-02 16:38:34 +00:00 |
|
|
|
10886eeaa2
|
Bump copyright year
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-01-01 12:13:06 +01:00 |
|
|
|
5c69ecf2bf
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2022-12-30 21:16:15 +01:00 |
|
|
|
0b91bfc047
|
Merge remote-tracking branch 'soapbox/develop' into merge-pleroma
|
2022-12-30 21:16:10 +01:00 |
|
marcin mikołajczak
|
64945b3b4c
|
Merge branch 'restrict-unauth' into 'develop'
Respect restrict_unauthenticated in /api/v1/accounts/lookup
See merge request soapbox-pub/rebased!232
|
2022-12-30 17:53:30 +00:00 |
|
Atsuko Karagi
|
08db6765c8
|
Respect restrict_unauthenticated in /api/v1/accounts/lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-29 23:30:04 +01:00 |
|
tusooa
|
4b66f2b7f1
|
Bump earmark to 1.4.22
|
2022-12-28 11:57:29 -05:00 |
|
marcin mikołajczak
|
232170cbff
|
Merge branch 'events-csp' into 'develop'
Actually fix CSP
See merge request soapbox-pub/rebased!231
|
2022-12-25 11:30:09 +00:00 |
|
|
|
9a3369f724
|
Actually fix CSP
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-25 10:04:29 +01:00 |
|
Alex Gleason
|
bc7af05954
|
Merge branch 'rebased-3.0' into 'develop'
Bump version to v3.0
See merge request soapbox-pub/rebased!230
|
2022-12-24 23:00:39 +00:00 |
|
Alex Gleason
|
7796bd4037
|
Bump version to v3.0
|
2022-12-24 16:59:22 -06:00 |
|
|
|
43f16e6321
|
Add ObanHelpers.perform_all to notifications test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-24 17:37:41 +01:00 |
|
|
|
29bc5d6d3f
|
delete test for destroy_multiple_from_types/2
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-24 17:30:32 +01:00 |
|
Haelwenn
|
2bc6911139
|
Merge branch 'weblate-extract' into 'develop'
Extract translatable strings
See merge request pleroma/pleroma!3818
|
2022-12-24 11:01:22 +00:00 |
|
weblate-extractor
|
64eef1eae4
|
Extract translatable strings
|
2022-12-24 06:06:39 +00:00 |
|
|
|
4b9df78df3
|
Add class=emoji to emojify test, related to commit 8f3e7505
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-23 20:36:34 +01:00 |
|
|
|
91f311c33f
|
Try to use the new privileges system for mastodon admin api
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-23 19:49:43 +01:00 |
|
|
|
e3970f730c
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-23 19:45:55 +01:00 |
|
Haelwenn
|
b367f22256
|
Merge branch 'mergeback/2.5.0' into 'develop'
Mergeback: 2.5.0
See merge request pleroma/pleroma!3817
|
2022-12-23 18:15:52 +00:00 |
|
Haelwenn (lanodan) Monnier
|
6126f203d3
|
mix: version 2.5.50
|
2022-12-23 18:46:14 +01:00 |
|
Haelwenn
|
f76c1d4f70
|
Merge branch 'release/2.5.0' into 'stable'
Release 2.5.0
See merge request pleroma/pleroma!3816
|
2022-12-23 17:43:21 +00:00 |
|
Haelwenn (lanodan) Monnier
|
91c22637de
|
mix: Release 2.5.0
|
2022-12-23 17:10:02 +01:00 |
|
Haelwenn (lanodan) Monnier
|
ee7694fa91
|
CHANGELOG: Set 2.5.0
|
2022-12-23 17:09:57 +01:00 |
|
Haelwenn (lanodan) Monnier
|
5ce7db455c
|
Git merge is not my favorite tool
|
2022-12-23 17:07:26 +01:00 |
|
Haelwenn (lanodan) Monnier
|
3fbd42061c
|
Revert "Delete report notifs when demoting from superuser"
This reverts commit 4504c81080.
|
2022-12-23 17:06:09 +01:00 |
|
Haelwenn (lanodan) Monnier
|
7d68d64d63
|
Merge back 2.4.5
|
2022-12-23 17:05:05 +01:00 |
|
Haelwenn
|
6bce88b9e7
|
Merge branch 'pleromafe-2.5.0' into 'develop'
Update PleromaFE bundle to 2.5.0
See merge request pleroma/pleroma!3815
|
2022-12-23 14:32:10 +00:00 |
|
Haelwenn (lanodan) Monnier
|
2c5bc9cffd
|
Update PleromaFE bundle to 2.5.0
|
2022-12-23 15:01:49 +01:00 |
|
Haelwenn
|
99ff91584d
|
Merge branch 'adminfe-2.5.0' into 'develop'
Update AdminFE bundle to version 2.5.0
See merge request pleroma/pleroma!3814
|
2022-12-23 13:48:35 +00:00 |
|
Haelwenn
|
718ff64c3b
|
Merge branch 'fine_grained_moderation_privileges' into 'develop'
fine grained moderation privileges (continued)
See merge request pleroma/pleroma!3812
|
2022-12-23 13:48:07 +00:00 |
|
|
|
7ee63904ec
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-22 19:20:52 +01:00 |
|
