111 commits

Author	SHA1	Message	Date
Roman Chvanikov	d2da3d30f3	Merge branch 'develop' into feature/digest-email	2019-07-24 16:37:52 +03:00
Ariadne Conill	0afaf96640	update mix.lock	2019-07-23 19:49:36 +00:00
Roman Chvanikov	afc7708dbe	Fix pleroma_job_queue version	2019-07-21 00:01:58 +03:00
Roman Chvanikov	36049f08ef	Merge develop	2019-07-20 01:03:25 +03:00
Ariadne Conill	cdf0038d0f	mix: update http signatures dependency	2019-07-18 15:53:01 +00:00
Ariadne Conill	1e3aff6ef1	mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989	2019-07-17 19:00:26 +00:00
Roman Chvanikov	e7c175c943	Use PleromaJobQueue for scheduling	2019-07-16 16:49:50 +03:00
Roman Chvanikov	9bca70b10a	Merge develop	2019-07-16 16:19:19 +03:00
lain	d302fcaa61	Dependencies: Update tzdata and related packages.	2019-07-15 16:47:39 +09:00
Roman Chvanikov	0384459ce5	Update mix.lock	2019-07-12 18:16:54 +03:00
Roman Chvanikov	eae991b06a	merge develop	2019-07-12 18:08:27 +03:00
Egor Kislitsyn	663aebdd59	Update gettext dependency	2019-07-10 18:10:09 +07:00
Maksim	12b1454245	[#1062] added option to disable send email	2019-07-10 05:34:21 +00:00
Maksim	bb8065a1fd	tests MRF filters	2019-07-10 05:12:21 +00:00
Roman Chvanikov	371d39e160	Merge develop	2019-07-09 21:21:09 +03:00
Alexander Strizhakov	4e6e5d8042	reverse proxy tests	2019-07-09 16:54:13 +00:00
Roman Chvanikov	657277ffc0	Resolve conflicts	2019-06-29 00:52:50 +03:00
William Pitcock	481932309f	mix: update bbcode dependency to v0.1.1	2019-06-21 23:42:50 +00:00
rinpatch	f30a3241d2	Deps: Update auto_linker	2019-06-18 16:08:18 +03:00
Mark Felder	2ad5a8511d	Update Phoenix to 1.4.8	2019-06-15 07:03:26 -05:00
Egor Kislitsyn	bf22ed5fbd	Update auto_linker dependency	2019-06-12 15:53:33 +07:00
lain	63ab3c30eb	Merge branch 'feature/rate-limiter' into 'develop' ... Feature/Rate Limiter Closes #943 See merge request pleroma/pleroma!1266	2019-06-11 11:32:01 +00:00
Egor Kislitsyn	581d8d3035	Update plug dependency	2019-06-11 16:50:35 +07:00
Egor Kislitsyn	7c063a898d	Update ex_rated dependency	2019-06-11 16:25:47 +07:00
Roman Chvanikov	ce47017c89	Merge develop	2019-05-29 18:18:22 +03:00
lain	f4cfcead88	Mix: Bring ecto-sql back to mainline.	2019-05-22 11:44:17 +02:00
lambda	e5b34f5e05	Merge branch 'ecto_sql_update' into 'develop' ... Dependencies: Update Ecto SQL. See merge request pleroma/pleroma!1160	2019-05-17 10:21:38 +00:00
lain	5743124c77	Dependencies: Update tzdata. ... This fixes the bug that tz data could not be loaded. Closes #910.	2019-05-17 11:51:50 +02:00
lain	67af50ec71	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update	2019-05-17 11:33:04 +02:00
lain	718b59a263	Dependencies: Update ecto sql once more.	2019-05-17 11:19:30 +02:00
lambda	4440e23547	Merge branch 'chore/extricate-http-signatures' into 'develop' ... switch to pleroma/http_signatures library See merge request pleroma/pleroma!1155	2019-05-15 15:37:31 +00:00
feld	f831acf912	Excoveralls for code coverage	2019-05-15 15:19:20 +00:00
lain	88cc423fa3	Dependencies: Update Ecto SQL.	2019-05-15 16:45:26 +02:00
William Pitcock	071f78733a	switch to pleroma/http_signatures library	2019-05-14 20:03:13 +00:00
Alexander Strizhakov	a2be420f94	differences_in_mastoapi_responses.md: fullname & bio are optionnal ... [ci skip]	2019-05-13 18:35:45 +00:00
Roman Chvanikov	f1f7a11222	Merge develop	2019-05-11 14:45:54 +07:00
feld	c953ae8c3d	Initial bundle of basic AdminFE ... Due to CSP headers we only allow connecting to self. If you want to host AdminFE on a separate domain without CSP headers you will be able to connect to any public Pleroma host.	2019-05-11 01:34:17 +00:00
Roman Chvanikov	b6b5b16ba4	Merge develop	2019-05-08 17:08:06 +07:00
lambda	238dd72fad	Merge branch 'conversations_three' into 'develop' ... Conversations once more. See merge request pleroma/pleroma!1119	2019-05-07 14:43:21 +00:00
lain	6ad8ddfd29	Merge remote-tracking branch 'origin/develop' into feature/bbs	2019-05-04 15:00:45 +02:00
lain	0e37fddd5a	Search: Add fts index on objects table.	2019-05-03 19:21:09 +02:00
lain	81d1aa424d	Streamer: Stream out Conversations/Participations.	2019-05-03 13:39:14 +02:00
Egor Kislitsyn	04fd7cf817	Update auto_linker	2019-05-01 15:18:12 +07:00
Roman Chvanikov	0f0cc2703b	Merge develop	2019-04-30 20:17:52 +07:00
William Pitcock	2bd880be88	mix: add bbcode dependency	2019-04-26 22:34:59 +00:00
Roman Chvanikov	64a2c6a041	Digest emails	2019-04-20 19:42:19 +07:00
Roman Chvanikov	2f0203a4a1	Resolve conflicts	2019-04-17 16:59:05 +07:00
rinpatch	37da03499e	Bump ex_doc	2019-04-16 14:53:17 +03:00
Egor	f9af90c5aa	Revert "simplify mentions escape" ... This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.	2019-04-12 19:25:53 +00:00
Ivan Tashkinov	bffddf5e31	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # docs/config.md # test/support/factory.ex	2019-04-08 12:20:26 +03:00