239 commits

Author	SHA1	Message	Date
Egor Kislitsyn	4944498133	Merge branch 'develop' into feature/compat/push-subscriptions ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/plugs/oauth_plug.ex	2018-12-06 20:15:16 +07:00
Egor Kislitsyn	8b4397c704	Merge branch 'develop' into feature/compat/push-subscriptions ... # Conflicts: # lib/mix/tasks/sample_config.eex # lib/pleroma/web/twitter_api/controllers/util_controller.ex # mix.exs # mix.lock	2018-12-06 19:55:58 +07:00
Egor Kislitsyn	04a48286e6	Add web push support	2018-12-06 19:29:04 +07:00
Maksim Pechnikov	3ce16e5a56	init tesla and updated the http requests in Pleroma.Web.Websub	2018-12-04 14:03:32 +03:00
href	f70b20e499	version string: force git abbrev size to 8 chars ... Fixes #389 Older git versions defaults to 7 chars.	2018-11-24 14:38:34 +01:00
href	bc5cf2c192	Improved version string	2018-11-20 17:55:03 +01:00
Haelwenn (lanodan) Monnier	ee41dbeca5	config/config.md: Create	2018-11-10 13:09:37 +01:00
Haelwenn (lanodan) Monnier	8221c56c48	Add ex_doc	2018-11-10 13:09:37 +01:00
lain	e954cfcc2c	Add CORSPlug to make web-based OAuth easier.	2018-11-03 13:38:01 +01:00
William Pitcock	b1be9415ef	Revert "Merge branch 'revert-a26d5e6b' into 'develop'" ... This reverts commit d31bbb1cfe, reversing changes made to 340ab3cb90.	2018-10-05 20:49:34 +00:00
Moon Man	75bc68dbc1	pinned crypt dependency to specific commit	2018-09-05 02:29:19 -04:00
Moon Man	1a8bc26e52	auth against sha512-crypt password hashes, upgrade to pbkdf2	2018-09-05 00:21:44 -04:00
lambda	58539e1357	Revert "Merge branch 'feature/rich-text' into 'develop'" ... This reverts merge request !309	2018-08-31 09:51:20 +00:00
William Pitcock	6aa65b68b8	common api: add support for formatting messages outside of twitter-style plain text	2018-08-31 03:13:59 +00:00
William Pitcock	4e4b1016ab	mix: add ex_aws and ex_aws_s3 dependencies	2018-08-27 23:24:35 +00:00
kaniini	05738e7643	fix compile	2018-08-16 15:37:58 +00:00
kaniini	f2fa09c50f	Merge branch 'develop' into 'patch-2' ... # Conflicts: # mix.exs	2018-08-16 15:23:04 +00:00
Artik Banana	718882b326	Update mix.exs	2018-06-27 19:35:38 +00:00
Tristan Mahé	cb21bf5fc2	filter exif data #187	2018-06-26 13:45:47 -07:00
Thog	e55c6f311b	Migrate to comeonin 4 and Cachex 3 ... Also fix some warning in the code and add a missing alias	2018-05-20 20:08:40 +02:00
Mark Felder	366138fa72	Update httpoison to get the latest hackney. ... Works on my computer ^TM	2018-04-11 13:55:54 +00:00
lain	4e4a3e5e13	Add mock.	2018-04-02 13:12:47 +02:00
lain	4afbef39f4	Format the code.	2018-03-30 15:01:53 +02:00
lain	86058c9a88	Return version in instance endpoint, set version to 0.9.0.	2018-03-27 20:09:01 +02:00
lain	fbc187ac15	Switch to Jason for json handling. ... It's twice as fast and will be the standard in the coming ecto.	2018-03-27 16:09:08 +02:00
Roger Braun	890503ca1e	Remove mix test.watch ... It recompiled too often and tested too long.	2017-09-09 12:00:03 +02:00
Roger Braun	4e785df984	Update Phoenix, add Phoenix.HTML.	2017-09-06 19:05:35 +02:00
Roger Braun	6ee0ca21e2	Some salmon debug fixes. ... Plus httpoison update.	2017-06-23 16:22:19 +02:00
Roger Braun	36ec998dd7	Update html_sanitize_ex.	2017-05-18 17:18:33 +02:00
dtluna	6cf7c13228	Refactor code to comply with credo suggestions	2017-04-27 16:18:50 +03:00
Roger Braun	424e0e7779	Add Websub verification.	2017-04-21 03:59:11 +02:00
Roger Braun	6bfd521974	Switch cache implementation for size limiting.	2017-04-17 11:36:17 +02:00
Roger Braun	03ddaead7e	Add basic user caching. ... Expires after 5 seconds.	2017-04-14 17:13:51 +02:00
Roger Braun	4cac385411	Add factories for testing.	2017-04-13 15:49:24 +02:00
Roger Braun	d2bf099ae6	Fix twitter api date.	2017-04-12 19:34:58 +02:00
Roger Braun	2e88cc4cbd	Add HTML sanitization library.	2017-04-03 18:28:00 +02:00
Roger Braun	e4de0ddc77	Add single status fetching to TwAPI.	2017-03-24 01:16:28 +01:00
Roger Braun	e32dbfc9a5	Add basic auth.	2017-03-20 17:56:45 +01:00
Roger Braun	a93f3421a7	Phoenix skeleton	2017-03-17 17:09:58 +01:00