552 commits

Author	SHA1	Message	Date
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
Egor Kislitsyn	b012e66e4e	Increase CAPTCHA expiration time to 5 minutes	2019-12-23 15:14:46 +07: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
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
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
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
Mark Felder	f673e3deef	Default log level for syslog in prod should also be :warn	2019-11-26 05:46:48 -06: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