|
|
c7309f723c
|
Add route to revoke all tokens
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-05-27 00:06:45 +02:00 |
|
Alex Gleason
|
8f6fde01b0
|
Merge branch 'spam-mrf-hotfix-2' into 'develop'
AntiMentionSpamPolicy: fix user age check
See merge request soapbox-pub/rebased!251
|
2023-05-22 00:33:02 +00:00 |
|
Alex Gleason
|
7e375cbdd1
|
AntiMentionSpamPolicy: fix user age check
|
2023-05-21 19:31:56 -05:00 |
|
Alex Gleason
|
8810045840
|
Merge branch 'spam-mrf-hotfix' into 'develop'
Spam MRF hotfix
See merge request soapbox-pub/rebased!250
|
2023-05-21 21:29:26 +00:00 |
|
Alex Gleason
|
54f2c37e10
|
AntiDuplicationPolicy: fix accidentally returning the inner object
|
2023-05-21 16:27:42 -05:00 |
|
Alex Gleason
|
7adead8df8
|
AntiDuplicationPolicy: fix messing up Announces
|
2023-05-21 16:12:33 -05:00 |
|
Alex Gleason
|
663574bea9
|
Merge branch 'spam-mrf' into 'develop'
Add AntiDuplicationPolicy and AntiMentionSpamPolicy
See merge request soapbox-pub/rebased!249
|
2023-05-21 20:50:45 +00:00 |
|
Alex Gleason
|
8954c239f3
|
Update CHANGELOG
|
2023-05-21 15:30:42 -05:00 |
|
Alex Gleason
|
c0a0d6bb43
|
Add AntiMentionSpamPolicy
|
2023-05-21 15:26:02 -05:00 |
|
Alex Gleason
|
f2cf4941ee
|
Add AntiDuplicationPolicy
|
2023-05-21 14:12:53 -05:00 |
|
marcin mikołajczak
|
6112d45a78
|
Merge branch 'translation_languages' into 'develop'
Implement /api/v1/instance/translation_languages
See merge request soapbox-pub/rebased!248
|
2023-05-13 13:29:30 +00:00 |
|
Alex Gleason
|
6d1da90e2b
|
Apply 1 suggestion(s) to 1 file(s)
|
2023-05-13 13:21:37 +00:00 |
|
|
|
33240c8604
|
Implement /api/v1/instance/translation_languages
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-05-13 13:23:54 +02:00 |
|
marcin mikołajczak
|
aa13f6918c
|
Merge branch 'instance-view-markup' into 'develop'
Expose markup configuration in InstanceView
See merge request soapbox-pub/rebased!246
|
2023-05-08 22:21:29 +00:00 |
|
|
|
a12735fba0
|
lint
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-05-08 21:54:08 +02:00 |
|
|
|
7de0b2f2c8
|
Expose markup configuration in InstanceView
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-04-30 17:33:11 +02:00 |
|
marcin mikołajczak
|
6e34df8955
|
Merge branch 'static-pages-styles' into 'develop'
Improve account header styles on authorization page
See merge request soapbox-pub/rebased!245
|
2023-04-05 22:44:55 +00:00 |
|
|
|
89b7557732
|
Improve account header styles on authorization page
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-04-05 23:42:55 +02:00 |
|
marcin mikołajczak
|
9310274c78
|
Merge branch 'merge-pleroma' into 'develop'
Merge pleroma
See merge request soapbox-pub/rebased!244
|
2023-03-28 10:48:37 +00:00 |
|
|
|
19b9ecb78c
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-03-28 12:36:52 +02:00 |
|
Haelwenn
|
4f7c11b281
|
Merge branch 'tusooa/3073-react-legacy' into 'develop'
Fix emoji reactions for legacy 2-tuple formats
Closes #3073
See merge request pleroma/pleroma!3861
|
2023-03-27 10:05:47 +00:00 |
|
tusooa
|
c5d946bc92
|
Fix emoji reactions for legacy 2-tuple formats
|
2023-03-26 15:12:40 -04:00 |
|
Haelwenn
|
6d0cc8fa2a
|
Merge branch 'features/image-object' into 'develop'
Add support for Image objects
Closes #1581
See merge request pleroma/pleroma!3145
|
2023-03-25 06:35:55 +00:00 |
|
Haelwenn
|
9c53d1fe19
|
Merge branch 'background-timeout' into 'develop'
Set background worker timeout to 15 minutes
See merge request pleroma/pleroma!3857
|
2023-03-25 05:40:35 +00:00 |
|
anemone
|
f463b7570e
|
Set background worker timeout to 15 minutes
|
2023-03-23 23:14:52 -07:00 |
|
marcin mikołajczak
|
401e832f89
|
Merge branch 'merge-pleroma' into 'develop'
Merge Pleroma
See merge request soapbox-pub/rebased!240
|
2023-03-17 21:45:40 +00:00 |
|
|
|
e30381a533
|
No kurwa serio???
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-03-17 22:33:16 +01:00 |
|
|
|
44df6d547b
|
Fix profile fields update
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-03-16 20:41:51 +01:00 |
|
|
|
2427bf4e50
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2023-03-16 17:02:57 +01:00 |
|
|
|
47271b50a1
|
Fix api spec and tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-03-16 17:01:43 +01:00 |
|
Alex Gleason
|
eb1b4b2530
|
Merge branch 'fix-privilege' into 'develop'
Prevent moderators from deleting admins
Closes #187
See merge request soapbox-pub/rebased!242
|
2023-03-16 13:28:01 +00:00 |
|
tusooa
|
bf9db78426
|
Merge branch 'docs-otp-support' into 'develop'
docs: Be more explicit about the level of compatibility of OTP releases
See merge request pleroma/pleroma!3849
|
2023-03-16 08:11:44 +00:00 |
|
Haelwenn
|
353538d16c
|
Merge branch 'pleroma-akkoma-emoji-port' into 'develop'
Custom emoji reactions support
See merge request pleroma/pleroma!3845
|
2023-03-16 08:00:00 +00:00 |
|
Haelwenn
|
c3600b6104
|
Merge branch 'feat/fields-rel-me-tag' into 'develop'
feat: build rel me tags with profile fields
See merge request pleroma/pleroma!3850
|
2023-03-16 07:53:27 +00:00 |
|
Alex Gleason
|
c64c4454d7
|
Prevent moderators from deleting admins
|
2023-03-15 19:20:36 -05:00 |
|
marcin mikołajczak
|
9af0657ec9
|
Merge branch 'show-reposted-replies' into 'develop'
Display reposted replies with exclude_replies: true
See merge request soapbox-pub/rebased!241
|
2023-03-15 20:21:40 +00:00 |
|
|
|
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 |
|
|
|
bda8589f16
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-03-15 19:39:24 +01:00 |
|
kPherox
|
83c7415803
|
fix: append field values to bio before parsing
|
2023-03-15 23:55:24 +09:00 |
|
tusooa
|
9145fd04f2
|
Merge branch 'remove-crypt' into 'develop'
Remove crypt(3) support
Closes #3030 and #3062
See merge request pleroma/pleroma!3847
|
2023-03-12 16:06:00 +00:00 |
|
tusooa
|
d18441e9c4
|
Indicate in changelog that removal of crypt is breaking
|
2023-03-12 16:04:43 +00:00 |
|
Alexander Tumin
|
2c2ea16b50
|
Allow custom emoji reactions: Add pleroma_custom_emoji_reactions feature, review changes
|
2023-03-12 11:39:17 +03:00 |
|
Haelwenn (lanodan) Monnier
|
ea07ec51ef
|
Add support for Image objects
|
2023-03-09 14:21:12 +01:00 |
|
Haelwenn
|
f5c6e44731
|
Merge branch 'tusooa/block-rel' into 'develop'
Allow with_relationships param for blocks
See merge request pleroma/pleroma!3843
|
2023-03-09 13:13:14 +00: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 |
|
Haelwenn
|
5cc23dc382
|
Merge branch 'fix/tag-feed-crashes' into 'develop'
fix: atom/rss feed issues
Closes #3045
See merge request pleroma/pleroma!3851
|
2023-03-06 22:55:24 +00:00 |
|
Haelwenn
|
0a042979b8
|
Merge branch 'fix/static-fe-feed-500' into 'develop'
fix: remove static_fe pipeline for /users/:nickname/feed
See merge request pleroma/pleroma!3852
|
2023-03-06 21:08:27 +00:00 |
|
faried nawaz
|
8241eff05b
|
remove static_fe pipeline for /users/:nickname/feed
|
2023-03-06 23:34:00 +05:00 |
|
faried nawaz
|
7b42ec5633
|
oops, remove unused import
|
2023-03-06 02:44:36 +05:00 |
|
