268 commits

Author	SHA1	Message	Date
Alexander Strizhakov	1fcdcb12a7	updating gun with bug fix ... https://github.com/ninenines/gun/issues/222	2020-03-30 12:47:12 +03:00
Alexander Strizhakov	f497cf2f7c	Merge branch 'develop' into gun	2020-03-30 12:15:23 +03:00
Cevado	4705590f76	Fix ssl option on Ecto config breaking release ... To use `:ssl` option on Ecto config it's required to include Erlang ssl application, this prevents releases to start when `:ssl` option is set to true.	2020-03-16 22:02:01 -03:00
Alexander Strizhakov	f0651730bd	Merge branch 'develop' into gun	2020-03-16 14:25:55 +03:00
Haelwenn (lanodan) Monnier	d1379c4de8	Formatting: Do not use \n and prefer <br> instead ... It moves bbcode to bbcode_pleroma as the former is owned by kaniini and transfering ownership wasn't done in a timely manner. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374 Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375	2020-03-13 16:07:17 +01:00
Alexander Strizhakov	d9f8941dac	Merge branch 'develop' into gun	2020-03-09 10:56:33 +03:00
rinpatch	86e7709a4d	mix.exs: bump version to development one	2020-03-08 23:24:30 +03:00
rinpatch	3508ae7039	version bump changelog and mix version	2020-03-05 22:35:23 +03:00
Alexander Strizhakov	fe47bcde8c	updating tesla ref	2020-03-04 19:44:03 +03:00
Alexander Strizhakov	d6bebd4f9c	moving some logic to tesla adapter ... - checking original inside gun adapter - flushing streams on max_body error	2020-03-04 18:13:24 +03:00
Mark Felder	85d571fc23	Move Tesla repo to our GitLab	2020-03-02 12:52:41 -06:00
Alexander Strizhakov	d9e4b77f8b	Merge branch 'develop' into gun	2020-03-01 12:48:49 +03:00
rinpatch	c026128325	deps: update cachex to 3.2.0	2020-02-29 20:40:23 +03:00
Alexander Strizhakov	3849bbb60d	temp using tesla from fork	2020-02-21 12:30:37 +03:00
Mark Felder	cf94349287	Merge branch 'develop' into gun	2020-02-18 09:06:27 -06:00
Alexander Strizhakov	514c899275	adding gun adapter	2020-02-18 08:19:01 +03:00
rinpatch	472132215e	Use floki's new APIs for parsing fragments	2020-02-16 01:55:26 +03:00
Haelwenn (lanodan) Monnier	04139c28fe	mix.exs: Move ex_syslogger and recon to hexpm	2020-02-14 19:09:41 +01:00
Mark Felder	0b19fcdda1	Update ferd/recon, requested by @tk to support an AMPQ library he's ... integrating with an MRF. Upstream changelog: 2.5.0 - Optional formatting of records in traces (thanks to @bartekgorny) - Basic support for OTP-22 in recon_alloc (base handling of foreign_blocks type)	2020-02-14 10:16:12 -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	9172540f8d	deps: update floki to 0.25.0 ... needed to make it use fast_html	2020-02-11 16:16:29 +03:00
Maksim Pechnikov	6813c0302c	Merge branch 'develop' into issue/1383	2020-02-10 20:49:20 +03:00
rinpatch	49e80a1537	Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop' ... Restarting pleroma from outside application See merge request pleroma/pleroma!2144	2020-02-05 16:59:21 +00:00
Maksim Pechnikov	21a2a05407	Merge branch 'develop' into issue/1383	2020-01-28 20:39:20 +03:00
Alexander Strizhakov	33bd8fbffe	filename and test fixes	2020-01-28 18:02:11 +03:00
Alexander Strizhakov	93b9f226e0	path fix	2020-01-28 16:32:33 +03:00
Alexander Strizhakov	251bbd794a	Apply suggestion to mix.exs	2020-01-28 13:29:44 +00:00
Alexander Strizhakov	aa3ba63513	like this	2020-01-28 15:41:45 +03:00
Alexander Strizhakov	91ea3ed82c	moving restarter application into pleroma repo	2020-01-28 15:19:05 +03:00
Maksim Pechnikov	02c3dd2e3d	update ecto	2020-01-28 10:43:47 +03:00
Alexander Strizhakov	e93cc561cd	restarting pleroma from outside application	2020-01-25 18:42:04 +03:00
Maksim Pechnikov	b8d5c09f48	Merge branch 'develop' into issue/1383	2020-01-22 09:30:30 +03:00
Haelwenn (lanodan) Monnier	5c533e10e7	Bump credo to 1.1.5	2020-01-20 12:17:14 +01:00
Maksim Pechnikov	b7908844f2	Merge branch 'develop' into issue/1383	2020-01-13 12:41:07 +03:00
Egor Kislitsyn	520940d3e2	Update captcha dependency	2019-12-28 19:48:54 +07:00
Maksim Pechnikov	67cb46e15d	Merge branch 'develop' into issue/1383	2019-12-14 21:44:10 +03:00
Egor Kislitsyn	e536796984	Add native captcha and enable it by default.	2019-12-12 17:39:39 +07:00
Maksim Pechnikov	5876a9cb79	Merge branch 'develop' into issue/1383	2019-12-08 19:52:46 +03:00
Maksim Pechnikov	469c0956cd	update excoveralls	2019-12-04 09:43:01 +03:00
Ivan Tashkinov	52cc7de82c	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # mix.lock	2019-11-29 10:17:59 +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
stwf	bd1984f054	update tests and Oban	2019-11-26 15:24:34 -05:00
Maksim Pechnikov	0e9be6bafa	moved OAuth.Token.CleanWorker to Oban Periodic jobs	2019-11-25 14:32:20 +03:00
Ivan Tashkinov	cad9b325e5	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs	2019-11-21 16:47:52 +03:00
Egor Kislitsyn	8ffd1c792c	Remove version mismatch warning	2019-11-21 18:22:18 +07:00
Ivan Tashkinov	aad6576130	[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.	2019-11-18 20:38:56 +03:00
Steven Fuchs	94627baa5c	New rate limiter	2019-11-11 12:13:06 +00: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