Merge branch 'develop' into feature/store-statuses-data-inside-flag
[akkoma] / lib / pleroma / web / pleroma_api / controllers / pleroma_api_controller.ex
2019-10-27 Maxim FilippovMerge branch 'develop' into feature/store-statuses...
2019-10-27 kaniiniMerge branch 'improve-user-info-migration' into 'develop'
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'readme-pg-contrib' into 'develop'
2019-10-26 kaniiniMerge branch 'conversation-read-status-for-blocking...
2019-10-25 eugenijmMark the conversations with the blocked user as read...
2019-10-21 kaniiniMerge branch 'feature/push-subject-for-dm' into 'develop'
2019-10-21 Maksim PechnikovMerge branch 'develop' into feature/masto_api_markers
2019-10-20 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-19 HaelwennMerge branch 'feature/mastofe-pwa' into 'develop'
2019-10-19 HaelwennMerge branch 'mark-all-conversations-as-read' into...
2019-10-19 eugenijmPleroma API: `POST /api/v1/pleroma/conversations/read...
2019-10-19 rinpatchMerge branch 'mix-emoji-task-pack-json' into 'develop'
2019-10-10 lainMerge remote-tracking branch 'origin/develop' into...
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 TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
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-30 Ariadne Conillsplit scrobble functions into their own controller
2019-09-30 Ariadne Conillrouter: change scrobble timeline route from now-playing...
2019-09-30 Ariadne Conillpleroma api: hook up scrobbler controller
2019-09-27 kaniiniMerge branch 'patch-2' into 'develop'
2019-09-27 kaniiniMerge branch 'update/docs-jp' into 'develop'
2019-09-26 Maxim FilippovMerge branch 'develop' into feature/moderation-log...
2019-09-26 kaniiniMerge branch 'hex-flake-id' 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-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 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
2019-09-17 Roman ChvanikovMove pleroma_api controllers into controllers sub-folders