108 commits

Author	SHA1	Message	Date
rinpatch	d16e2a2e04	Remove duplicated header from admin_api.md	2019-03-28 20:16:59 +03:00
rinpatch	dfae0050af	Move out of Gitlab Wiki ... I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just * Gets everything from gitlab wiki * Removes some specific gitlab hacks * Formats all documentation file names to be in snake case so they look the same way as our code does	2019-03-28 19:46:30 +03:00
rinpatch	4a6855d9ee	Provide plaintext representations of content/cw in MastoAPI	2017-01-01 03:10:08 +03:00
lambda	23067908de	Merge branch 'feature/770-add-emoji-tags' into 'develop' ... Feature/770 add emoji tags See merge request pleroma/pleroma!998	2019-04-08 09:50:00 +00:00
feld	9aeac7dcca	Merge branch 'feature/prometheus' into 'develop' ... Upstream: Metrics and debugging See merge request pleroma/pleroma!1020	2019-04-06 14:51:46 +00:00
Alex S	7410aee886	Merge develop to 770-add-emoji-tags ... Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs	2019-04-06 20:34:00 +07:00
Mark Felder	5564cd421d	Document Prometheus	2019-04-04 12:19:31 -05:00
Alex S	3601f03147	Adding tag to emoji ets table ... changes in apis	2019-04-01 17:17:57 +07:00