8c8f648168
Merge remote-tracking branch 'soapbox/develop' into webfinger-expanding
2022-08-09 13:11:27 +02:00
25ac4b10dc
Add update_nickname_on_user_fetch to description.exs
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-09 13:11:18 +02:00
55c62d19a8
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-03 23:42:48 +02:00
cca794e5fe
Merge remote-tracking branch 'soapbox/develop' into webhooks
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-26 19:12:52 +02:00
5153eba3a8
Add authorized_fetch_mode to description.exs
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-25 19:53:51 +02: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
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
4a57a65695
Mastodon-compatible webhooks
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-06-25 23:26:42 +02:00
Pierre-Louis Bonicoli
6f23fc8e08
Add tlsv1.3 to suggestions
2022-05-31 00:51:48 +02:00
fbf9eced11
Add short_description field
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-29 14:04:27 +02:00
6500965fb3
Add short_description field
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-29 14:01:03 +02:00
d76bfd4e89
Location: user_location_length
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-14 22:52:06 +01:00
Alex Gleason
502b63d8ea
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
2022-02-06 12:31:53 -06:00
e473bcf7a0
Max media attachment count
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-06 17:41:15 +01:00
Alex Gleason
25786c804b
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
2022-01-25 09:39:25 -06:00
Alex Gleason
98ce239ebc
Update description.exs
2022-01-22 13:28:00 -06:00
Alex Gleason
66e8c6f90f
Birthdays: birth_date --> birthday
2022-01-22 13:21:55 -06:00
Alex Gleason
64f48c4239
Merge remote-tracking branch 'pleroma/develop' into next
2022-01-22 11:24:43 -06:00
397f67fef8
Format code, expose instance configuration related to birth dates
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-18 18:18:38 +01:00
b108b05650
Birth dates, birthday reminders API, allow instance admins to require minimum age
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-18 14:57:48 +01:00
0f90fd5805
WIP account endorsements
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-12 18:15:10 +01:00
Alex Gleason
bb0571cb35
Merge remote-tracking branch 'pleroma/develop' into next
2021-12-27 17:04:24 -06:00
Alibek Omarov
f02715c4b2
Fix lint errors
2021-12-27 03:42:03 +03:00
Alibek Omarov
cd1041c3a4
API: optionally restrict moderators from accessing sensitive data
2021-12-27 02:27:48 +03:00
Alex Gleason
b41631f62c
Merge remote-tracking branch 'pleroma/develop' into next
2021-12-25 21:24:21 -06:00
marcin mikołajczak
de006443f0
MastoAPI: Profile directory
2021-12-26 02:35:17 +00:00
lain
e2772d6bf1
Merge branch 'block-behavior' into 'develop'
...
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
2021-11-15 14:27:59 +00:00
Haelwenn
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
2021-09-07 16:41:53 +00:00
Alex Gleason
90680aad90
Merge tag 'v2.4.0' into pleroma-v2.4.0
2021-08-08 10:46:48 -05:00
Ilja
ee26f2c91b
Quarantine placeholders
...
* kePlaceholder and valuePlaceholder of quarantined_instances where in wrong case, should be snake_case
* The mrf simple and transparency exclusion were already OK
2021-08-06 07:59:54 +02:00
Ilja
f4028c908c
Add key- and valuePlaceholders for quarantined_instances and mrf_simple
...
* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here
* I also added comments to explain why we did the _info keys (backwards compatibility)
2021-08-06 07:59:53 +02:00
Ilja
64002e92ad
config/description.exs: Update quarantine settings to tuples
2021-08-06 07:59:53 +02:00
Sean King
dc4814f0cd
Fix merge conflicts with upstream
2021-06-04 14:42:44 -06:00
Haelwenn
a5dce42c85
Merge branch 'chore/rename-chat' into 'develop'
...
Rename the non-federating Chat feature to Shout
See merge request pleroma/pleroma!2842
2021-06-03 15:52:16 +00:00
Mark Felder
679d4c23e9
Update wording for relays in docs and config description
2021-06-02 11:30:09 -05:00
Mark Felder
297feb73f4
Formatting
2021-06-02 11:21:04 -05:00
Mark Felder
dcf84ac12e
disableChat / disableShout didn't actually do anything for PleromaFE
2021-06-01 16:53:32 -05:00
Mark Felder
8ff2d8d17d
Update description file for new shout config setting location
2021-06-01 11:49:47 -05:00
Mark Felder
36fe8950f7
Update PleromaFE settings for the old chat box
2021-06-01 11:49:16 -05:00
Mark Felder
ff00b354fa
Rename the non-federating Chat feature to Shout
2021-06-01 11:49:14 -05:00
Snow
69aed310de
Adding description
2021-05-29 02:22:33 +00:00
Mark Felder
fe40f6f291
Switch from the deprecated "use Mix.config" to "import Config"
2021-05-20 14:02:58 -05:00
Alex Gleason
b00d3bafa6
Merge remote-tracking branch 'origin/develop' into rich-media-redux
2021-05-05 12:38:58 -05:00
Alex Gleason
6b2fa5f0bb
Let :oembed_providers_enabled be configurable
2021-05-04 16:28:14 -05:00
Alex Gleason
01c220b722
Merge commit 'b7b05a074867c1444dd539d6d2331f6d5504f6e6' into blockers-visible
2021-04-29 13:52:36 -05:00
Alex Gleason
762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior
2021-04-29 11:14:32 -05:00
Sean King
fa2e62078c
Remove MastoFE configuration stuff
2021-04-15 23:51:04 -06:00
Mark Felder
2557e805a3
Support for configuration via AdminFE
2021-03-30 11:10:43 -05:00
Ivan Tashkinov
77f3da0358
[ #3213 ] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
2021-02-23 13:52:28 +03:00
Ivan Tashkinov
a98c4423f3
Apply i1t's suggestion(s) to 1 file(s)
2021-02-22 20:41:57 +00:00
