14 commits

Author	SHA1	Message	Date
Egor Kislitsyn	96816ceaa2	Revert "Merge branch 'revert-4fabf83a' into 'develop'" ... This reverts commit fe7fd33126, reversing changes made to 4fabf83ad0.	2019-09-16 17:55:04 +07:00
kaniini	c623b4324d	Revert "Merge branch 'streamer-refactoring' into 'develop'" ... This reverts merge request !1653	2019-09-16 09:09:21 +00:00
Steven Fuchs	aab264db82	Streamer refactoring	2019-09-16 07:44:03 +00:00
Egor Kislitsyn	4b7f1c6995	Improve digest email template	2019-08-14 20:46:05 +07:00
Roman Chvanikov	657277ffc0	Resolve conflicts	2019-06-29 00:52:50 +03:00
rinpatch	92213fb87c	Replace Mix.env with Pleroma.Config.get(:env) ... Mix.env/0 is not availible in release environments such as distillery or elixir's built-in releases.	2019-06-06 23:59:51 +03:00
Roman Chvanikov	64a2c6a041	Digest emails	2019-04-20 19:42:19 +07:00
William Pitcock	22e2ed235d	logging: only return ISE reasons in API responses when in dev or test mode	2019-02-20 17:36:47 +00:00
William Pitcock	8b08096436	logging: improve visibility into ISE errors	2019-02-20 17:14:18 +00:00
William Pitcock	980b5288ed	update copyright years to 2019	2018-12-31 15:41:47 +00:00
William Pitcock	2791ce9a1f	add license boilerplate to pleroma core	2018-12-23 20:56:42 +00:00
lain	4afbef39f4	Format the code.	2018-03-30 15:01:53 +02:00
Roger Braun	2a298d70f9	Add very basic oauth and mastodon api support.	2017-09-06 19:06:25 +02:00
Roger Braun	a93f3421a7	Phoenix skeleton	2017-03-17 17:09:58 +01:00