Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / lib / pleroma / web / pleroma_api / controllers / emoji_api_controller.ex
2019-10-10 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-10-07 kaniiniMerge branch 'mrf/simple_policy/check_actor' into ...
2019-10-07 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-07 HaelwennMerge branch '1234-mastodon-2-4-3-oauth-scopes' into...
2019-10-06 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-10-02 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-09-30 kPheroxMerge remote-tracking branch 'upstream/develop' into...
2019-09-30 Ivan Tashkinov[#1260] Merge remote-tracking branch 'remotes/upstream...
2019-09-30 kaniiniMerge branch 'features/apc2s-media-upload' into 'develop'
2019-09-27 kaniiniMerge branch 'patch-2' into 'develop'
2019-09-27 kaniiniMerge branch 'update/docs-jp' into 'develop'
2019-09-26 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-09-26 Maxim FilippovMerge branch 'develop' into feature/moderation-log...
2019-09-26 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-26 Roman ChvanikovMerge develop
2019-09-26 kaniiniMerge branch 'refactor/notification-controller' into...
2019-09-26 kaniiniMerge branch 'feature/return-link-for-password-reset...
2019-09-26 kaniiniMerge branch 'refactor/user' into 'develop'
2019-09-26 kaniiniMerge branch 'hex-flake-id' into 'develop'
2019-09-26 kaniiniMerge branch 'feature/activities-pagination-by-offset...
2019-09-26 kaniiniMerge branch 'fix/do-not-embed-first-pages-in-collectio...
2019-09-25 rinpatchMerge branch 'hotfix/hackney-1.15.2' into 'develop'
2019-09-25 rinpatchMerge branch 'support/test' into 'develop'
2019-09-25 rinpatchMerge branch 'emoji-packs-create-dir' into 'develop'
2019-09-25 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-09-25 Ekaterina VaartisFix nodeinfo handling
2019-09-25 Ekaterina VaartisAdd an API endpoint for listing remote packs
2019-09-25 vaartisCredo fix (remove parens on function definition)
2019-09-25 vaartisMove emoji_dir_path & cache_seconds_per_file
2019-09-25 Ekaterina VaartisWhen listing emoji packs, be sure to create the directory
2019-09-25 lainMerge branch 'issue/1218' into 'develop'
2019-09-25 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-09-24 Maxim FilippovMerge branch 'develop' into feature/return-link-for...
2019-09-24 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-23 kaniiniMerge branch 'feature/force-password-reset' into 'develop'
2019-09-23 kaniiniMerge branch 'support-rel-ugc' into 'develop'
2019-09-23 kaniiniMerge branch 'remove-direct-messages-from-public-timeli...
2019-09-23 kaniiniMerge branch 'test/activity_pub/transmogrifier.ex'...
2019-09-23 kaniiniMerge branch 'emoji-pack-json-pretty' into 'develop'
2019-09-23 Ekaterina VaartisAlso pretty print pack.json
2019-09-23 rinpatchMerge branch 'update-adminfe/2019-09-23' into 'develop'
2019-09-23 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-23 Maksim PechnikovMerge branch 'develop' into test/activity_pub/transmogr...
2019-09-23 rinpatchMerge branch 'better-emoji-packs' into 'develop'
2019-09-23 rinpatchEmoji API Controller: Follow phoenix directory structure