Ivan Tashkinov
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
feld
6cc5341d26
Merge branch 'config/benchmark' into 'develop'
...
Benchmark env uses test database so we should be able to use test.secret.exs
See merge request pleroma/pleroma!2057
5 years ago
Hakaba Hitoyo
0c9c62509d
Remove MDII uploader
5 years ago
Ivan Tashkinov
39ce894a07
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
Ivan Tashkinov
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
Mark Felder
89243fee8e
Fix captcha time, which was meant to be 5 minutes
5 years ago
Egor Kislitsyn
b012e66e4e
Increase CAPTCHA expiration time to 5 minutes
5 years ago
Mark Felder
b7811dfb7b
Instead allow a dedicated benchmark config
5 years ago
Mark Felder
50638525db
Merge branch 'develop' into config/benchmark
5 years ago
Egor Kislitsyn
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Egor Kislitsyn
fc484e5ce6
Add Kocaptcha endpoint to config.exs
5 years ago
Egor Kislitsyn
8d242f52d4
Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha"
...
This reverts commit 82c62c5028
.
5 years ago
Egor Kislitsyn
82c62c5028
Add default endpoint to Pleroma.Captcha.Kocaptcha
5 years ago
Egor Kislitsyn
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Egor Kislitsyn
470a3a678d
Add Kocaptcha endpoint to the test config
5 years ago
Egor Kislitsyn
e536796984
Add native captcha and enable it by default.
5 years ago
stwf
63ffa0e3ed
try local sheduling
5 years ago
Mark Felder
df469b4468
Benchmark env uses test database so we should be able to use test.secret.exs
5 years ago
Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
5 years ago
Egor Kislitsyn
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Egor Kislitsyn
ed92784e7c
Set Logger level to :info in prod
5 years ago
Egor Kislitsyn
a75d4a41e0
Add a test for custom runtime modules
5 years ago
Egor Kislitsyn
157bceeda9
Move runtime configuration from `:instance` to `:modules`
5 years ago
Ivan Tashkinov
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
Ivan Tashkinov
af42c00cff
[ #1427 ] Reworked admin scopes support.
...
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
5 years ago
Egor Kislitsyn
48ae3c4347
Add support for custom modules
5 years ago
lain
aa97fe8f17
ChatChannel: Ignore messages that are too long.
5 years ago
Mark Felder
f673e3deef
Default log level for syslog in prod should also be :warn
5 years ago
Sadposter
d3656c2725
add ability to set a custom user-agent string
5 years ago
rinpatch
dedb1ad5d6
Merge branch 'revert-5c6c3026' into 'develop'
...
Revert "Merge branch 'patch-1' into 'develop'"
See merge request pleroma/pleroma!2002
5 years ago
rinpatch
dc9303eac5
Revert "Merge branch 'patch-1' into 'develop'"
...
This reverts merge request !1829
5 years ago
Mark Felder
edaae845af
Some tasks try to set log level in test environment, but we were stripping logs belog :warn.
...
Ensure console backend logs in test environment are :warn, but mix tasks run in test env
do not run with :debug because it's far too verbose.
5 years ago
Mark Felder
c65190c799
Console backend's log format should be prefixed and suffixed with newlines.
...
This is how upstream does it by default.
5 years ago
Mark Felder
1c17f18329
Be specific about format for logs in test as we have tests that check it
5 years ago
Mark Felder
cb513a599c
Allow test builds to have info and debug logs stripped
5 years ago
Mark Felder
ff9133b978
Allow mix tasks to always run with debug logging
5 years ago
Ariadne Conill
1d33eeca72
config: add configuration for MRF ObjectAgePolicy
5 years ago
kaniini
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
5 years ago
lain
72cc92259e
Default config: Use extended nickname format
5 years ago
rinpatch
4499a7a075
Disable attachment links by default
...
Closes #1394
5 years ago
lain
e08bd99bab
Apply suggestion to config/config.exs
5 years ago
lain
4885d403fe
Apply suggestion to config/config.exs
5 years ago
Maksim Pechnikov
9d0b989521
add subject to atom feed
5 years ago
Phil Hagelberg
886a07ba57
Move static_fe config to its own section instead of in :instance.
5 years ago
rinpatch
2f4e9a068f
Bump fast_sanitize to 0.1.1
...
The parser C-Node has been completely rewritten to not use the deprecated
`erl_interface` api.
Closes #1378 since Nodex was ripped out and the replacement randomizes
master node name.
5 years ago
rinpatch
9434e151a9
Blacklist myhtmlex nodes from swarm
5 years ago
rinpatch
05d111b622
Use the default scrubber before mediaproxy transformation
5 years ago
KokaKiwi
638457ba94
MastoFE: Add PWA manifest.
5 years ago
rinpatch
5c6c3026ea
Merge branch 'patch-1' into 'develop'
...
Fix a typo in default static directory configuration for OTP releases
Closes #1289
See merge request pleroma/pleroma!1829
5 years ago
Ariadne Conill
c6de0cbb4a
config: disable Websub and Salmon publisher modules
5 years ago