0f33698747
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-12 23:08:40 +01:00
017e35fbf1
Fix some more typos
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-28 00:17:04 +01:00
0ebbe8d9d7
Merge remote-tracking branch 'pleroma/develop' into HEAD
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-10-28 00:30:08 +02:00
tusooa
e349e92a44
Add mrf to force link tag of quoting posts
2023-09-13 19:20:30 -04:00
tusooa
163e563733
Allow more flexibility in InlineQuotePolicy
2023-09-13 19:19:05 -04:00
Alex Gleason
57ef1d1211
Add InlineQuotePolicy to force quote URLs inline
2023-09-13 19:19:04 -04:00
f1592b2947
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-26 22:32:27 +02:00
tusooa
ef8a6c539a
Make EmojiPolicy aware of custom emoji reactions
2023-07-07 06:58:31 -04:00
tusooa
18a8378beb
Update config cheatsheet
2023-07-07 06:58:31 -04:00
Alex Gleason
944fd73b36
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
2023-06-05 15:38:19 -05:00
Mark Felder
50a20f3bbd
Esacpe the asterisks in Markdown
2023-05-29 15:53:16 -04:00
Mark Felder
9caa0b0be1
Add OnlyMedia Upload Filter to simplify restricting uploads to audio, image, and video types
2023-05-29 15:49:04 -04:00
94cdedc6c9
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-05-09 22:27:06 +02:00
duponin
0231a09310
Remove SSH/BBS feature from core
...
And link to sshocial, the replacement client for this removed feature
2023-04-23 10:47:07 +02: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
Sean King
60df2d8a97
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-18 22:03:48 -07:00
a9da110ac6
Add rate limiting for events actions
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-02 23:11:28 +01:00
1d6b91c071
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-23 15:33:54 +01:00
Mark Felder
c7a0df8006
Remove Quack from docs and cheatsheet
2022-11-18 10:09:52 -05:00
b7879d58f3
Merge remote-tracking branch 'pleroma/develop' into HEAD
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-15 23:27:58 +01:00
tusooa
e3e68b9377
Update config cheatsheet
2022-11-12 12:55:02 -05:00
Haelwenn (lanodan) Monnier
648e012022
ObjectAgePolicy: Make strip_followers behavior for followers-only explicit
2022-11-07 14:58:47 +01:00
Alex Gleason
39d7093ff5
Remove Shout feature
2022-11-03 13:29:52 -05:00
Hélène
1a67a20364
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:40:24 +00:00
Hélène
f9fc3a153d
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:40:10 +00:00
Hélène
ce0a6737e7
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:40:02 +00:00
Hélène
97e8c8a10a
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:39:26 +00:00
Hélène
d24d74b1a7
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:39:21 +00:00
Hélène
db789acf1e
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:39:11 +00:00
Hélène
d622fe8d48
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:39:03 +00:00
Hélène
02b4b4da47
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:38:45 +00:00
Hélène
02947bafeb
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:38:30 +00:00
Hélène
ad730c2135
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:38:23 +00:00
Hélène
2baf3084a1
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:38:01 +00:00
Hélène
92da9c4a47
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:37:41 +00:00
Hélène
275c60208b
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:37:27 +00:00
abe13622e6
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-17 16:08:26 +02:00
Ilja
44d14e8a9c
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
2022-07-14 07:07:19 +02:00
tusooa
fdc71f6051
Merge branch 'short-description' into 'develop'
...
Add short_description instance field
Closes #2865
See merge request pleroma/pleroma!3651
2022-07-13 04:42:24 +00:00
Ilja
f88ed1df75
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
2022-07-05 12:05:19 +02:00
Ilja
42d4bd3a5d
Rename pipelines and add forgotten tags
...
I renamed some tags before, but forgot to rename the pipelines
I also had some tags which I forgot to add to the config, description, etc.
These have now been done/added
2022-07-02 08:55:14 +02:00
Ilja
15748fd301
Add better explanation in the Cheatsheet about what each tag does
2022-07-02 08:17:22 +02:00
Ilja
51f87ba30c
Change order of privilege tags to make more sense
...
The tags were listed in different places
They were listed in a rather randomly order
I reordered them in a way I think makes more sense
2022-07-02 07:59:46 +02:00
Ilja
8303af84ce
Rename the Exiftool module
...
No migrations or checks yet
2022-07-01 12:15:02 +02:00
Ilja
551721e41a
Rename the new module
2022-07-01 12:13:46 +02:00
Ilja
cd316d7269
Use EXIF data of image to prefill image description
...
During attachment upload Pleroma returns a "description" field. Pleroma-fe has an MR to use that to pre-fill the image description field, <https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1399 >
* This MR allows Pleroma to read the EXIF data during upload and return the description to the FE
* If a description is already present (e.g. because a previous module added it), it will use that
* Otherwise it will read from the EXIF data. First it will check -ImageDescription, if that's empty, it will check -iptc:Caption-Abstract
* If no description is found, it will simply return nil, just like before
* When people set up a new instance, they will be asked if they want to read metadata and this module will be activated if so
This was taken from an MR i did on Pleroma and isn't finished yet.
2022-07-01 12:13:46 +02:00
Ilja
0d697bc15a
Add docs and CHANGELOG entries
2022-07-01 10:50:32 +02:00
Alex Gleason
e13f64bd8e
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
2022-05-17 11:19:29 -05:00
Ilja
a8093732bd
Also use actor_type to determine if an account is a bot in antiFollowbotPolicy
2022-05-08 18:10:40 +00:00
fbf9eced11
Add short_description field
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-29 14:04:27 +02:00
