622 commits

Author	SHA1	Message	Date
Ivan Tashkinov	61d9f43e46	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-18 17:46:09 +03:00
Ivan Tashkinov	269d592181	[#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).	2020-02-15 20:41:38 +03:00
feld	b312c36b8e	Merge branch 'develop' into 'fix/rename-no_attachment_links-setting' ... # Conflicts: # config/description.exs	2020-02-13 14:37:55 +00:00
Mark Felder	571a475c7e	Formatting	2020-02-13 08:02:33 -06:00
Mark Felder	9b778dc54a	Formatting	2020-02-13 08:01:39 -06:00
feld	4f5ee26f2d	Update description.exs	2020-02-13 14:00:33 +00:00
feld	e4016f4dbd	Apply suggestion to config/description.exs	2020-02-13 13:59:47 +00:00
Mark Felder	ff9fd4ca89	Fix the confusingly named and inverted logic of "no_attachment_links" ... The setting is now simply "attachment_links" and the boolean value does what you expect. A double negative is never possible and describing the functionality is no longer a philospher's worst nightmare.	2020-02-11 15:39:19 -06:00
Mark Felder	9581d57382	First round at cleaning up descriptions	2020-02-11 15:21:36 -06:00
feld	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
Alexander Strizhakov	bfd16fe41e	set oban crontab to false in tests	2020-02-11 12:19:06 +03:00
Maksim Pechnikov	6813c0302c	Merge branch 'develop' into issue/1383	2020-02-10 20:49:20 +03:00
Ivan Tashkinov	4e6bbdc7b5	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-08 19:59:37 +03:00
Ivan Tashkinov	d458f4fdca	[#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.	2020-02-08 19:58:02 +03:00
Alexander Strizhakov	7a2e153a8d	description change	2020-02-06 13:15:23 +03:00
Alexander Strizhakov	bdf0a87be9	dropdown type	2020-02-06 12:50:37 +03:00
feld	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
Ivan Tashkinov	e84fee5b86	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-05 07:56:36 +03: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
Hakaba Hitoyo	dabd535e43	Remove user recommendation by third party engine	2020-01-27 13:21:50 +00:00
Alexander Strizhakov	f72727a409	little fixes	2020-01-27 12:53:21 +03:00
Maksim Pechnikov	bfc70fdf29	Merge branch 'develop' into issue/1383	2020-01-27 08:48:19 +03:00
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
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
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