Commit Graph

651 Commits

Author SHA1 Message Date
Alexander Strizhakov
5943d78c74
description typos, Oban verbose type fix, new keys 2020-01-25 19:45:51 +03:00
Ivan Tashkinov
86e4d23acb [#1505] Background fetching of incoming activities' replies collections. 2020-01-25 10:47:30 +03:00
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
2020-01-24 13:54:44 +00:00
Alexander Strizhakov
e9d8a84790
better descriptions for email fields for admin-fe 2020-01-24 11:19:12 +03:00
Alexander Strizhakov
b0ae69d996
removing deleted MDII uploader from suggestions 2020-01-24 11:05:03 +03:00
Egor Kislitsyn
3c4a30c6db
Add NewUsersDigestEmail to config/description.exs 2020-01-23 18:53:11 +04:00
Mark Felder
e151dea276 Merge branch 'develop' into feature/new-registrations-digest 2020-01-22 15:59:24 -06:00
Ivan Tashkinov
cf96c40057 [#1505] Added Mastodon-compatible replies collection to Note federated representation. 2020-01-22 21:10:17 +03:00
Maksim Pechnikov
cf19bf3c7c Merge branch 'develop' into issue/1383 2020-01-22 20:20:39 +03:00
Egor Kislitsyn
5c842e3b68
Merge branch 'develop' into feature/new-registrations-digest 2020-01-22 21:18:27 +04:00
Egor Kislitsyn
aa0f0d4edd
Disable NewUsersDigestEmail by default 2020-01-22 20:53:06 +04:00
Egor Kislitsyn
df0b8f1d08
Add new users digest email 2020-01-22 20:31:42 +04: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
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
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
Maksim Pechnikov
b7908844f2 Merge branch 'develop' into issue/1383 2020-01-13 12:41:07 +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
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
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
Egor Kislitsyn
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules 2019-12-16 22:34:21 +07:00
Egor Kislitsyn
a12b6454bb
Add an option to require fetches to be signed 2019-12-16 22:24:03 +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
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
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
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
Egor Kislitsyn
ed92784e7c Set Logger level to :info in prod 2019-12-09 19:11:54 +07:00
Maksim Pechnikov
5876a9cb79 Merge branch 'develop' into issue/1383 2019-12-08 19:52:46 +03: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
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
Mark Felder
f673e3deef Default log level for syslog in prod should also be :warn 2019-11-26 05:46:48 -06: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
rinpatch
dedb1ad5d6 Merge branch 'revert-5c6c3026' into 'develop'
Revert "Merge branch 'patch-1' into 'develop'"

See merge request pleroma/pleroma!2002
2019-11-21 15:20:05 +00:00
rinpatch
dc9303eac5 Revert "Merge branch 'patch-1' into 'develop'"
This reverts merge request !1829
2019-11-21 15:03:27 +00:00
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.
2019-11-20 11:55:30 -06: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
1c17f18329 Be specific about format for logs in test as we have tests that check it 2019-11-20 09:14:27 -06:00
Mark Felder
cb513a599c Allow test builds to have info and debug logs stripped 2019-11-19 16:21:30 -06:00
Mark Felder
ff9133b978 Allow mix tasks to always run with debug logging 2019-11-19 16:01:17 -06:00
Ariadne Conill
1d33eeca72 config: add configuration for MRF ObjectAgePolicy 2019-11-14 18:26:06 -06:00
kaniini
2cc043591c Merge branch 'feature/static-fe' into 'develop'
Static frontend

See merge request pleroma/pleroma!1917
2019-11-11 19:10:44 +00:00
lain
72cc92259e Default config: Use extended nickname format 2019-11-11 12:49:18 +00:00
rinpatch
4499a7a075 Disable attachment links by default
Closes #1394
2019-11-10 15:02:47 +03:00
lain
e08bd99bab Apply suggestion to config/config.exs 2019-11-10 11:02:34 +00:00
lain
4885d403fe Apply suggestion to config/config.exs 2019-11-10 10:44:23 +00:00
Maksim Pechnikov
9d0b989521 add subject to atom feed 2019-11-10 11:10:20 +03:00
Phil Hagelberg
886a07ba57 Move static_fe config to its own section instead of in :instance. 2019-11-09 18:08:45 -08:00
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.
2019-11-08 00:51:04 +03:00
rinpatch
9434e151a9 Blacklist myhtmlex nodes from swarm 2019-10-29 01:16:22 +03:00
rinpatch
05d111b622 Use the default scrubber before mediaproxy transformation 2019-10-29 01:15:28 +03:00
KokaKiwi
638457ba94 MastoFE: Add PWA manifest. 2019-10-19 12:15:14 +02:00
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
2019-10-18 22:29:04 +00:00
Ariadne Conill
c6de0cbb4a config: disable Websub and Salmon publisher modules 2019-10-18 14:50:09 +00:00
yalh76
fb5dce481c Fix https://git.pleroma.social/pleroma/pleroma/issues/1289 2019-10-10 20:05:54 +00:00
lain
ecd7ac855b Benchmark config: Don't use the sql sandbox. 2019-10-10 15:42:54 +02:00
lain
2629493804 Benchmark config: Database adjustments. 2019-10-10 15:01:06 +02:00
lain
c54ae662dc Merge remote-tracking branch 'origin/develop' into benchmark-finishing 2019-10-10 14:40:59 +02:00
lain
02f8e2a8ab Gitlab: Run benchmark in CI. 2019-10-10 14:24:54 +02:00
Sergey Suprunenko
4b3f77a99f Extract RSS Feed functionality from OStatus 2019-10-07 12:20:41 +00:00
Ivan Tashkinov
f459aabdfa Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
#	CHANGELOG.md
2019-10-06 09:30:49 +03:00
Mark Felder
b8b98ac40f Add missing extended_nickname_format setting to the default config 2019-10-03 10:40:49 -05:00
Ivan Tashkinov
6ffa2b5f66 [#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
#	CHANGELOG.md
2019-09-30 17:41:20 +03:00