|
|
237b2068f9
|
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
This reverts merge request !2194
|
2020-02-11 16:55:18 +00:00 |
|
rinpatch
|
ea1631d7e6
|
Make Floki use fast_html
|
2020-02-11 16:17:21 +03:00 |
|
Maksim Pechnikov
|
6813c0302c
|
Merge branch 'develop' into issue/1383
|
2020-02-10 20:49:20 +03:00 |
|
|
|
b21e59da5f
|
Merge branch 'remove-linker-scheme-option' into 'develop'
Remove AutoLinker `scheme` option from the config
See merge request pleroma/pleroma!2176
|
2020-02-05 20:32:45 +00:00 |
|
Egor Kislitsyn
|
3909b5b7b3
|
Remove AutoLinker scheme option from the config
|
2020-02-05 21:13:56 +04:00 |
|
Maksim Pechnikov
|
2c40c8b4a2
|
Merge branch 'develop' into issue/1383
|
2020-02-03 21:42:36 +03:00 |
|
Roman Chvanikov
|
8057157ee3
|
Make attachments cleanup optional
|
2020-01-31 01:20:37 +03:00 |
|
rinpatch
|
7499805abf
|
config.exs: Re-enable rate limiter and enable remote ip
|
2020-01-30 00:06:58 +03:00 |
|
Maksim Pechnikov
|
21a2a05407
|
Merge branch 'develop' into issue/1383
|
2020-01-28 20:39:20 +03:00 |
|
|
|
dabd535e43
|
Remove user recommendation by third party engine
|
2020-01-27 13:21:50 +00:00 |
|
Maksim Pechnikov
|
cf19bf3c7c
|
Merge branch 'develop' into issue/1383
|
2020-01-22 20:20:39 +03:00 |
|
Alexander Strizhakov
|
32a643a159
|
Merge branch 'develop' into admin-be
|
2020-01-22 11:22:31 +03:00 |
|
Maksim Pechnikov
|
b8d5c09f48
|
Merge branch 'develop' into issue/1383
|
2020-01-22 09:30:30 +03:00 |
|
Roman Chvanikov
|
795a5fe441
|
Add delete_attachments queue to config
|
2020-01-21 19:48:14 +03:00 |
|
Alexander Strizhakov
|
503d966e9f
|
Merge branch 'develop' into admin-be
|
2020-01-21 10:32:27 +03:00 |
|
Alexander Strizhakov
|
e699861690
|
full update for some subkeys
|
2020-01-18 12:25:56 +03: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
|
70c7a26de8
|
Merge branch 'develop' into admin-be
|
2020-01-14 14:52:00 +03:00 |
|
Maksim Pechnikov
|
b7908844f2
|
Merge branch 'develop' into issue/1383
|
2020-01-13 12:41:07 +03:00 |
|
|
|
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 |
|
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 |
|
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 |
|
Egor Kislitsyn
|
b012e66e4e
|
Increase CAPTCHA expiration time to 5 minutes
|
2019-12-23 15:14:46 +07:00 |
|
Maksim Pechnikov
|
54c9db38c8
|
Merge branch 'develop' into issue/1383
|
2019-12-21 20:38:59 +03: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 |
|
Maksim Pechnikov
|
67cb46e15d
|
Merge branch 'develop' into issue/1383
|
2019-12-14 21:44:10 +03:00 |
|
Egor Kislitsyn
|
7528322f83
|
Merge branch 'develop' into feature/custom-runtime-modules
|
2019-12-13 01:51:52 +07:00 |
|
Egor Kislitsyn
|
e536796984
|
Add native captcha and enable it by default.
|
2019-12-12 17:39:39 +07: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 |
|
Egor Kislitsyn
|
c098dec473
|
Merge branch 'develop' into feature/custom-runtime-modules
|
2019-12-10 00:16:43 +07:00 |
|
Maksim Pechnikov
|
5876a9cb79
|
Merge branch 'develop' into issue/1383
|
2019-12-08 19:52:46 +03: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 |
|
lain
|
aa97fe8f17
|
ChatChannel: Ignore messages that are too long.
|
2019-12-04 12:48:34 +01:00 |
|
Maksim Pechnikov
|
652cc6ba4b
|
updated ScheduledActivity
|
2019-12-04 09:12:17 +03:00 |
|
Maksim Pechnikov
|
b7c449118b
|
Merge branch 'develop' into issue/1383
|
2019-11-28 21:27:01 +03:00 |
|
Maksim Pechnikov
|
d55859f5a4
|
remove quantum package
|
2019-11-27 16:35:12 +03:00 |
|
Maksim Pechnikov
|
a4f834a687
|
moved DigestEmail to Oban Periodic jobs
|
2019-11-27 15:59:13 +03:00 |
|
Maksim Pechnikov
|
c5766a8100
|
moved ActivityExpiration to Oban Periodic jobs
|
2019-11-27 13:36:03 +03:00 |
|
Maksim Pechnikov
|
6f202a401b
|
moved ScheduledActivity to Oban Periodic jobs
|
2019-11-27 09:26:37 +03:00 |
|
Maksim Pechnikov
|
ac3abb5414
|
moved Pleroma.Stats to Oban Periodic jobs
|
2019-11-26 10:54:30 +03:00 |
|
Maksim Pechnikov
|
0e9be6bafa
|
moved OAuth.Token.CleanWorker to Oban Periodic jobs
|
2019-11-25 14:32:20 +03:00 |
|
Sadposter
|
d3656c2725
|
add ability to set a custom user-agent string
|
2019-11-25 09:53:11 +00:00 |
|
Mark Felder
|
c65190c799
|
Console backend's log format should be prefixed and suffixed with newlines.
This is how upstream does it by default.
|
2019-11-20 11:18:42 -06:00 |
|
Mark Felder
|
ff9133b978
|
Allow mix tasks to always run with debug logging
|
2019-11-19 16:01:17 -06:00 |
|
