Commit Graph

1064 Commits

Author SHA1 Message Date
eugenijm fc92a0fd8d Added limits and media attachments for scheduled activities. 2019-04-06 23:55:58 +03: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
Egor Kislitsyn f1712cd2f1 Use PleromaJobQueue in Pleroma.Web.Push 2019-04-05 19:38:44 +07:00
Ivan Tashkinov 47a236f753 [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme. 2019-04-05 15:12:02 +03:00
Mark Felder 66e7b03372 Merge branch 'develop' into feature/prometheus 2019-04-04 15:39:42 -05:00
Mark Felder 5564cd421d Document Prometheus 2019-04-04 12:19:31 -05:00
Egor Kislitsyn cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2 2019-04-04 16:10:43 +07:00
Alex S d140738edf second level of headertext change in doc 2019-04-02 20:36:36 +07:00
Alex S 3465b7ba9a syntax highlighting 2019-04-02 20:32:37 +07:00
Alex S 9e0567ec52 Merge develop into feature/770-add-emoji-tags 2019-04-02 19:16:29 +07:00
Alex S 08d64b977f little changes and typos 2019-04-02 16:13:34 +07:00
Alex S 851c5bf093 updating custom_emoji docs 2019-04-02 15:57:57 +07:00
Alex S 3601f03147 Adding tag to emoji ets table
changes in apis
2019-04-01 17:17:57 +07:00