sn0w
60bfaed368
Allow reacting with emojis containing a number
2022-06-14 11:47:09 +02:00
FloatingGhost
32fbd2e4e3
fix all tests
2022-06-11 16:14:22 +01:00
FloatingGhost
142646426e
fix emoji tests
2022-06-11 14:08:54 +01:00
FloatingGhost
0f6bece60d
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
2022-01-08 21:45:12 +00:00
FloatingGhost
0d012ebea1
Revert "Merge branch 'remove/mastofe' into 'develop'"
...
This reverts commit 6b3842cf506b1282a829
2022-01-08 21:44:37 +00:00
FloatingGhost
12a171844b
Merge remote-tracking branch 'upstream/develop' into develop
2021-12-30 18:05:22 +00: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
marcin mikołajczak
de006443f0
MastoAPI: Profile directory
2021-12-26 02:35:17 +00: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
FloatingGhost
de60b1f3c1
make search provider configurable
2021-12-12 17:35:35 +00:00
FloatingGhost
449d8ff165
integrate search endpoint with ES
2021-12-12 17:35:35 +00:00
Alex Gleason
2ac3d341b0
Fix benchmarks
2021-12-12 17:35:02 +00: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
ce4560c2a1
Fix benchmarks
2021-12-03 16:20:54 -05:00
sadposter
a61207cf8f
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-11-19 13:43:24 +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
sadposter
bd9c9136f9
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-09-13 16:14:58 +01:00
sadposter
1aab9b94b1
fix config
2021-09-13 16:13:42 +01: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
sadposter
b202cf15d6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-08-30 22:04:42 +01: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
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
sadposter
2519d4eb1a
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-08-02 22:10:01 +01: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
33a19c002a
Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix
2021-07-27 08:29:53 -05:00
Alex Gleason
94db0b7cd6
Add activity+json to Phoenix :format_encoders
...
Fixes ErrorView rendering
2021-07-27 08:28:52 -05:00
Alex Gleason
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
2021-07-18 11:49:22 -05:00
Alex Gleason
0114754db2
MastodonAPI: Support poll notification
2021-07-17 22:19:38 -05:00
sadposter
e56c319e8f
merge
2021-06-27 22:31:37 +01: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
d6432a65da
Move shout configuration from :instance, update docs and changelog
2021-06-01 11:49:46 -05:00
Mark Felder
36fe8950f7
Update PleromaFE settings for the old chat box
2021-06-01 11:49:16 -05:00
Mark Felder
68aa56b9e4
Just call it shout
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
