2ac3d341b0
Fix benchmarks
3 years ago
a61207cf8f
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
e2772d6bf1
Merge branch 'block-behavior' into 'develop'
...
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
3 years ago
bd9c9136f9
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
1aab9b94b1
fix config
3 years ago
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
3 years ago
b202cf15d6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
21720db859
Merge branch 'dkuku-develop-patch-66061' into 'develop'
...
Update dev.exs error message to write to stderr.
See merge request pleroma/pleroma!3492
3 years ago
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
3 years ago
1841bd8383
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
3 years ago
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
3 years ago
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)
3 years ago
64002e92ad
config/description.exs: Update quarantine settings to tuples
3 years ago
2519d4eb1a
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
5c5571c668
use puts instead warn
3 years ago
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
3 years ago
33a19c002a
Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix
3 years ago
94db0b7cd6
Add activity+json to Phoenix :format_encoders
...
Fixes ErrorView rendering
3 years ago
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
3 years ago
0114754db2
MastodonAPI: Support poll notification
3 years ago
e56c319e8f
merge
3 years ago
dc4814f0cd
Fix merge conflicts with upstream
3 years ago
a5dce42c85
Merge branch 'chore/rename-chat' into 'develop'
...
Rename the non-federating Chat feature to Shout
See merge request pleroma/pleroma!2842
3 years ago
679d4c23e9
Update wording for relays in docs and config description
3 years ago
297feb73f4
Formatting
3 years ago
dcf84ac12e
disableChat / disableShout didn't actually do anything for PleromaFE
3 years ago
8ff2d8d17d
Update description file for new shout config setting location
3 years ago
d6432a65da
Move shout configuration from :instance, update docs and changelog
3 years ago
36fe8950f7
Update PleromaFE settings for the old chat box
3 years ago
68aa56b9e4
Just call it shout
3 years ago
ff00b354fa
Rename the non-federating Chat feature to Shout
3 years ago
69aed310de
Adding description
3 years ago
a833a2d76b
Merge branch 'plug-runtime-dev' into 'develop'
...
Put Plugs in runtime mode in :dev, :test to speed up recompilation
See merge request pleroma/pleroma!3411
3 years ago
fe40f6f291
Switch from the deprecated "use Mix.config" to "import Config"
3 years ago
0461794375
Merge remote-tracking branch 'pleroma/develop' into plug-runtime-dev
3 years ago
e3173a279d
Put Plugs in runtime mode in :dev, :test to speed up recompilation
3 years ago
32ae8f4906
Merge remote-tracking branch 'pleroma/develop' into optional-config
3 years ago
b22f54eb29
Make prod.secret.exs optional (with warning)
3 years ago
50a644a221
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior
3 years ago
fa2e62078c
Remove MastoFE configuration stuff
3 years ago
2557e805a3
Support for configuration via AdminFE
4 years ago
8b81d62227
Upstream original followbot implementation
4 years ago
5f62b55a6f
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
f930e83fa2
Merge branch 'fix/remove_auto_nsfw' into 'develop'
...
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
4 years ago
292ddf730c
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy
4 years ago
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
4 years ago
77f3da0358
[ #3213 ] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
4 years ago
Alex Gleason