Alex Gleason
94838fc10a
Add HellthreadPolicy by default
2022-02-01 15:28:53 -06:00
Alex Gleason
5371017fa7
Merge remote-tracking branch 'pleroma/quote-post' into inline-quote-default
2022-01-27 15:01:58 -06:00
Alex Gleason
a3d65937ab
Add InlineQuotePolicy as a default MRF
2022-01-27 15:01:20 -06:00
Alex Gleason
93a340668f
Merge remote-tracking branch 'origin/develop' into quote-post
2022-01-25 11:57:04 -06:00
Alex Gleason
25786c804b
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
2022-01-25 09:39:25 -06:00
Alex Gleason
dd7977bb68
Merge branch 'birth-dates' into 'develop'
...
Birth dates
See merge request pleroma/pleroma!3608
2022-01-25 15:35:47 +00:00
Alex Gleason
51dd5a6e21
Merge remote-tracking branch 'pleroma/quote-post' into quote-improvements
2022-01-24 17:18:30 -06:00
Alex Gleason
7f1d82a523
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
2022-01-24 16:55:39 -06:00
Alex Gleason
1cb8326cfb
Merge remote-tracking branch 'origin/develop' into quote-post
2022-01-24 16:48:37 -06:00
Alex Gleason
0571f8f553
Add InlineQuotePolicy to force quote URLs inline
2022-01-24 16:44:35 -06:00
Alex Gleason
53de3a9d44
Revert "Merge branch 'log-slow-queries' into 'develop'"
...
This reverts merge request !3553
2022-01-24 18:54:43 +00: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
21675e1430
Soapbox: configure privileged_staff: true
2021-12-27 17:06:08 -06:00
Alex Gleason
bb0571cb35
Merge remote-tracking branch 'pleroma/develop' into next
2021-12-27 17:04:24 -06:00
Alex Gleason
a659428024
Merge branch 'restricted-moderators' into 'develop'
...
AdminAPI: Optionally restrict moderators from accessing sensitive data
See merge request pleroma/pleroma!3578
2021-12-27 17:06:22 +00:00
Alex Gleason
6e27fc9c12
Merge branch 'log-slow-queries' into 'develop'
...
Log slow Ecto queries
See merge request pleroma/pleroma!3553
2021-12-27 15:41:06 +00:00
Ivan Tashkinov
08c0f09bad
Made slow queries logging disabled by default.
2021-12-27 09:13:31 +03: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
Ivan Tashkinov
3e9e7178bc
Configurability of slow queries logging ([:pleroma, :telemetry, :slow_queries_logging]). Adjusted log messages truncation to 65 kb (was default: 8 kb). Non-truncated logging of slow query params.
2021-12-26 22:49:00 +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
Alex Gleason
58577d89e0
Merge remote-tracking branch 'origin/develop' into live-dashboard
2021-12-15 19:06:10 -05:00
Alex Gleason
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
2021-12-15 19:05:36 -05:00
Alex Gleason
29d80b39f2
Add Phoenix LiveDashboard
...
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-15 19:05:27 -05:00
lain
613f55b078
Merge branch 'benchmark' into 'develop'
...
Fix benchmarks
See merge request pleroma/pleroma!3551
2021-12-06 21:16:30 +00:00
Alex Gleason
cebd707ac0
Merge remote-tracking branch 'pleroma/benchmark' into benchmark
2021-12-05 17:05:16 -05:00
Alex Gleason
ce4560c2a1
Fix benchmarks
2021-12-03 16:20:54 -05:00
Alex Gleason
40a76612d6
Soapbox: increase default pool_size and timeout
2021-11-22 20:31:33 -06:00
Alex Gleason
9fc15b7310
Restore SetMeta upload filter for backwards compatibility
2021-11-21 13:38:57 -06: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
rinpatch
21720db859
Merge branch 'dkuku-develop-patch-66061' into 'develop'
...
Update dev.exs error message to write to stderr.
See merge request pleroma/pleroma!3492
2021-08-13 12:10:52 +00:00
Haelwenn
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
2021-08-09 10:02:37 +00: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
Sean King
1841bd8383
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
2021-08-06 08:08:20 -06: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
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
Daniel
5c5571c668
use puts instead warn
2021-07-27 21:01:41 +00:00
Daniel
69ebfb29fb
Update dev.exs error message to write to stderr. Currently it dumps this message at the beginnig of the file when using vim-autoformat with mix format
2021-07-27 20:41:36 +00:00
Alex Gleason
b726efef41
Soapbox: support Cloudflare status codes
2021-07-27 09:36:09 -05:00
Alex Gleason
f709d9d106
Merge remote-tracking branch 'origin/develop' into errorview-json-fix
2021-07-27 08:39:48 -05:00