fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-27 16:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
8173 commits 26 branches 108 tags 316 MiB
Commit graph

631 commits

Author SHA1 Message Date
sadposter 4646d3c9d6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-01-23 11:55:07 +00:00
Alexander Strizhakov 32a643a159
Merge branch 'develop' into admin-be 2020-01-22 11:22:31 +03:00
Roman Chvanikov 795a5fe441 Add delete_attachments queue to config 2020-01-21 19:48:14 +03:00
Alexander Strizhakov f01ab6cd29
some refactor and tests 2020-01-21 18:42:00 +03:00
Alexander Strizhakov 503d966e9f
Merge branch 'develop' into admin-be 2020-01-21 10:32:27 +03:00
Alexander Strizhakov efb8ef5abe
releases support 2020-01-18 17:14:50 +03:00
Alexander Strizhakov e699861690
full update for some subkeys 2020-01-18 12:25:56 +03:00
sadposter 4e069ce537 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-01-16 16:17:56 +00:00
sadposter 5664427d6c branch 2020-01-16 16:13:51 +00:00
Ivan Tashkinov 5304c8cd21 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks 2020-01-15 18:12:08 +03:00
Alexander Strizhakov 41c7f34905
short labels and fixes for typos 2020-01-14 15:00:38 +03:00
Alexander Strizhakov 70c7a26de8
Merge branch 'develop' into admin-be 2020-01-14 14:52:00 +03:00
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
 2020-01-12 18:31:10 +00:00
Hakaba Hitoyo 0c9c62509d Remove MDII uploader 2020-01-11 17:19:54 +00:00
Alexander Strizhakov 7d128ca208
dynamic_configuration renaming 
and moving it from instance settings
 2020-01-10 19:34:19 +03:00
Alexander Strizhakov 00aff5f78c
syncing new setting to descriptions.exs 2020-01-10 17:54:54 +03:00
Ivan Tashkinov 39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks 
# Conflicts:
#	lib/pleroma/user.ex
 2020-01-10 16:18:32 +03:00
Alexander 0b02040327
little fixes and typos fix 2020-01-10 15:52:02 +03:00
Alexander cda2c1fc63
fix for subgroup tuple 
added settings for swoosh adapters local
 2020-01-10 15:52:01 +03:00
Alexander f9d01068cf
suggestions fix 2020-01-10 15:52:01 +03:00
Alexander 4306769671
adapter children 2020-01-10 15:52:00 +03:00
Alex S 2753285b77
config editing through database 2020-01-10 15:51:59 +03:00
Ivan Tashkinov 6c94b7498b [#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests. 2020-01-10 10:52:21 +03:00
Mark Felder 89243fee8e Fix captcha time, which was meant to be 5 minutes 2020-01-09 15:45:46 -06:00
sadposter 5f4fc0c373 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-23 19:07:20 +00:00
Egor Kislitsyn b012e66e4e
Increase CAPTCHA expiration time to 5 minutes 2019-12-23 15:14:46 +07:00
Mark Felder b7811dfb7b Instead allow a dedicated benchmark config 2019-12-19 12:16:53 -06:00
Mark Felder 50638525db Merge branch 'develop' into config/benchmark 2019-12-19 12:16:33 -06:00
sadposter 5fb1c96500 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-17 17:54:15 +00:00
Egor Kislitsyn b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules 2019-12-16 22:34:21 +07:00
Egor Kislitsyn fc484e5ce6
Add Kocaptcha endpoint to config.exs 2019-12-16 19:35:10 +07:00
Egor Kislitsyn 8d242f52d4
Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha" 
This reverts commit 82c62c5028.
 2019-12-16 19:33:51 +07:00
Egor Kislitsyn 82c62c5028
Add default endpoint to Pleroma.Captcha.Kocaptcha 2019-12-16 15:32:33 +07:00
sadposter 6f5844cf8e Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-15 14:11:26 +00:00
Egor Kislitsyn 7528322f83 Merge branch 'develop' into feature/custom-runtime-modules 2019-12-13 01:51:52 +07:00
sadposter 803bce3668 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-12 17:48:36 +00:00
Egor Kislitsyn 470a3a678d Add Kocaptcha endpoint to the test config 2019-12-12 18:04:52 +07:00
Egor Kislitsyn e536796984 Add native captcha and enable it by default. 2019-12-12 17:39:39 +07:00
stwf 63ffa0e3ed try local sheduling 2019-12-11 14:57:33 -05:00
Mark Felder df469b4468 Benchmark env uses test database so we should be able to use test.secret.exs 2019-12-11 12:52:57 -06:00
sadposter 97f67e0786 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-11 10:01:04 +00:00
Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes 
# Conflicts:
#	CHANGELOG.md
 2019-12-10 08:55:14 +03:00
sadposter d3cee00057 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-09 18:17:59 +00:00
Egor Kislitsyn c098dec473 Merge branch 'develop' into feature/custom-runtime-modules 2019-12-10 00:16:43 +07:00
Egor Kislitsyn ed92784e7c Set Logger level to :info in prod 2019-12-09 19:11:54 +07:00
Egor Kislitsyn a75d4a41e0 Add a test for custom runtime modules 2019-12-06 17:05:09 +07:00
Egor Kislitsyn 157bceeda9 Move runtime configuration from :instance to :modules 2019-12-06 15:04:46 +07:00
Ivan Tashkinov 13926537b6 Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes 2019-12-06 00:26:31 +03:00
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).
 2019-12-06 00:25:44 +03:00
Egor Kislitsyn 48ae3c4347 Add support for custom modules 2019-12-05 20:18:25 +07:00