Maksim Pechnikov
|
bfc70fdf29
|
Merge branch 'develop' into issue/1383
|
5 years ago |
|
Alexander Strizhakov
|
5943d78c74
|
description typos, Oban verbose type fix, new keys
|
5 years ago |
|
feld
|
0a5e792454
|
Merge branch 'fix/better-descriptions-for-email-fields' into 'develop'
Better descriptions for email fields for admin-fe
Closes admin-fe#67
See merge request pleroma/pleroma!2138
|
5 years ago |
|
Alexander Strizhakov
|
e9d8a84790
|
better descriptions for email fields for admin-fe
|
5 years ago |
|
Alexander Strizhakov
|
b0ae69d996
|
removing deleted MDII uploader from suggestions
|
5 years ago |
|
Maksim Pechnikov
|
cf19bf3c7c
|
Merge branch 'develop' into issue/1383
|
5 years ago |
|
Alexander Strizhakov
|
32a643a159
|
Merge branch 'develop' into admin-be
|
5 years ago |
|
Maksim Pechnikov
|
b8d5c09f48
|
Merge branch 'develop' into issue/1383
|
5 years ago |
|
Roman Chvanikov
|
795a5fe441
|
Add delete_attachments queue to config
|
5 years ago |
|
Alexander Strizhakov
|
f01ab6cd29
|
some refactor and tests
|
5 years ago |
|
Alexander Strizhakov
|
503d966e9f
|
Merge branch 'develop' into admin-be
|
5 years ago |
|
Alexander Strizhakov
|
efb8ef5abe
|
releases support
|
5 years ago |
|
Alexander Strizhakov
|
e699861690
|
full update for some subkeys
|
5 years ago |
|
Ivan Tashkinov
|
5304c8cd21
|
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
|
5 years ago |
|
Alexander Strizhakov
|
41c7f34905
|
short labels and fixes for typos
|
5 years ago |
|
Alexander Strizhakov
|
70c7a26de8
|
Merge branch 'develop' into admin-be
|
5 years ago |
|
Maksim Pechnikov
|
b7908844f2
|
Merge branch 'develop' into issue/1383
|
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 |
|
Alexander Strizhakov
|
7d128ca208
|
dynamic_configuration renaming
and moving it from instance settings
|
5 years ago |
|
Alexander Strizhakov
|
00aff5f78c
|
syncing new setting to descriptions.exs
|
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 |
|
Alexander
|
0b02040327
|
little fixes and typos fix
|
5 years ago |
|
Alexander
|
cda2c1fc63
|
fix for subgroup tuple
added settings for swoosh adapters local
|
5 years ago |
|
Alexander
|
f9d01068cf
|
suggestions fix
|
5 years ago |
|
Alexander
|
4306769671
|
adapter children
|
5 years ago |
|
Alex S
|
2753285b77
|
config editing through database
|
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 |
|
Maksim Pechnikov
|
54c9db38c8
|
Merge branch 'develop' into issue/1383
|
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 |
|
Maksim Pechnikov
|
67cb46e15d
|
Merge branch 'develop' into issue/1383
|
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 |
|
Maksim Pechnikov
|
5876a9cb79
|
Merge branch 'develop' into issue/1383
|
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 |
