9 commits

Author	SHA1	Message	Date
Ivan Tashkinov	b93856874d	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex	2019-10-06 17:12:17 +03:00
Ekaterina Vaartis	118d6dcdf4	Fix nodeinfo handling	2019-09-25 12:32:19 +02:00
Ekaterina Vaartis	ba9d35a904	Add an API endpoint for listing remote packs	2019-09-25 12:32:19 +02:00
vaartis	a6e85215e1	Credo fix (remove parens on function definition)	2019-09-25 12:32:19 +02:00
vaartis	f21dbbc021	Move emoji_dir_path & cache_seconds_per_file	2019-09-25 12:32:19 +02:00
Ekaterina Vaartis	cdbe7cd37a	When listing emoji packs, be sure to create the directory	2019-09-25 12:32:19 +02:00
Maksim Pechnikov	1a858134ed	Merge branch 'develop' into issue/1218	2019-09-25 12:24:12 +03:00
Ekaterina Vaartis	e63f167f01	Also pretty print pack.json	2019-09-24 00:37:27 +03:00
rinpatch	6b3d5ed6db	Emoji API Controller: Follow phoenix directory structure	2019-09-23 21:14:51 +03:00

Renamed from lib/pleroma/web/pleroma_api/emoji_api_controller.ex (Browse further)