Merge branch 'develop' into issue/1276
[akkoma] / test / web / pleroma_api / controllers / pleroma_api_controller_test.exs
2019-12-05 Maksim PechnikovMerge branch 'develop' into issue/1276
2019-11-21 lainMerge branch 'issue/1348' into 'develop'
2019-11-15 rinpatchMerge branch 'bugfix/1395-email-activation' into 'develop'
2019-11-14 Maxim FilippovMerge branch 'develop' into feature/admin-api-list...
2019-11-14 rinpatchMerge branch 'fix/conversations-rendering' into 'develop'
2019-11-14 feldMerge branch 'feature/reports-groups-and-multiple-state...
2019-11-14 Egor KislitsynMerge remote-tracking branch 'upstream/develop' into...
2019-11-14 rinpatchMerge branch 'reactions' into 'develop'
2019-11-10 lainMerge branch 'develop' into 'reactions'
2019-11-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-11-04 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-10-27 Maxim FilippovMerge branch 'develop' into feature/store-statuses...
2019-10-24 Egor KislitsynMerge remote-tracking branch 'upstream/develop' into...
2019-10-24 Maksim PechnikovMerge branch 'develop' into issue/1276
2019-10-23 feldMerge branch '1304-user-info-deprecation' into 'develop'
2019-10-23 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
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-21 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-21 Egor KislitsynMerge branch 'develop' into refactor/following-relation...
2019-10-20 Ivan Tashkinov[#1304]. Post-merge fixes. Merge branch 'develop' of...
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-10 lainMerge branch 'develop' into 'reactions'
2019-10-07 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-10-07 lainMerge branch 'develop' into 'reactions'
2019-10-07 lainMerge branch 'develop' into 'reactions'
2019-10-07 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-07 lainMerge branch 'misskey-compat' into 'reactions'
2019-10-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-06 lainMerge branch 'develop' into 'reactions'
2019-10-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-06 HaelwennMerge branch 'fix-prameter-name-of-accounts-update...
2019-10-05 kaniiniMerge branch 'split-masto-api/leftovers' into 'develop'
2019-10-05 kaniiniMerge branch 'accept-embedded-announce-object' into...
2019-10-05 kaniiniMerge branch 'unread-conversation-count' into 'develop'
2019-10-05 eugenijmMastodon API: Add `pleroma.unread_conversation_count...
2019-10-05 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-05 kaniiniMerge branch 'revert-5c04e817' into 'develop'
2019-10-05 kaniiniRevert "Merge branch 'user-info-unread-direct-conversat...
2019-10-05 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-04 kaniiniMerge branch 'bugfix/widen-streamer-blocks' into 'develop'
2019-10-04 kaniiniMerge branch 'user-info-unread-direct-conversation...
2019-10-04 lainMerge branch 'featrue/job-monitor' into 'develop'
2019-10-03 eugenijmMastodon API: Add `pleroma.unread_conversation_count...
2019-10-02 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-10-02 lainPleromaAPI: Add unreacting.
2019-10-02 lainMerge remote-tracking branch 'origin/develop' into...
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 'split-masto-api/accounts' into 'develop'
2019-09-30 Egor KislitsynAdd PleromaAPI.AccountController
2019-09-29 rinpatchMerge branch 'develop' into cleanup/drop-subscription...
2019-09-29 rinpatchMerge branch 'revert/subscription-refactoring' into...
2019-09-29 rinpatchRevert subscription refactoring.
2019-09-28 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-27 kaniiniMerge branch 'refactor/status-controller' into 'develop'
2019-09-27 kaniiniMerge branch 'refactor/subscription' into 'develop'
2019-09-26 Roman ChvanikovMerge develop
2019-09-17 Roman ChvanikovMove pleroma_api controllers into controllers sub-folders