Merge branch 'develop' into 'remove-twitter-api'
[akkoma] / lib / pleroma / web / pleroma_api / controllers / scrobble_controller.ex
2020-05-16 lainMerge branch 'develop' into 'remove-twitter-api'
2020-05-14 lainMerge branch 'features/openrc-console' into 'develop'
2020-05-10 lainMerge branch 'shortening-modules-name' into 'develop'
2020-05-02 rinpatchMerge branch 'feature/1710-consolidate-instance-info...
2020-05-01 lainMerge branch 'issue/1577' into 'develop'
2020-05-01 Maksim PechnikovMerge branch 'develop' into issue/1276-2
2020-04-30 lainMerge branch '1364-no-pushes-from-blocked-domains-users...
2020-04-30 Egor KislitsynMerge branch 'develop' into openapi/notifications
2020-04-30 Egor KislitsynMerge branch 'develop' into openapi/reports
2020-04-29 lainMerge branch 'automatic-authentication-and-instance...
2020-04-28 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-22 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-22 Ivan TashkinovFixed OAuth restrictions for :api routes. Made auth...
2020-04-22 lainMerge branch 'docs/debian-packages' into 'develop'
2020-04-21 Ivan Tashkinovchecks of authentication / instance publicity. Definiti...
2020-03-19 lainMerge branch 'remake-remodel' into develop
2020-03-13 rinpatchMerge branch 'feature/mastofe-admin-scope' into 'develop'
2020-03-13 rinpatchMerge branch 'docs/direct_conversation_id' into 'develop'
2020-03-13 rinpatchMerge branch 'static-accept-missing' into 'develop'
2020-03-11 feldMerge branch 'fix/signup-without-email' into 'develop'
2020-03-11 feldMerge branch 'relay-list-change' into 'develop'
2020-03-09 lainMerge branch 'patch-1' into 'develop'
2020-03-08 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-03-08 rinpatchMerge branch 'release/2.0.0' into 'stable'
2020-03-07 rinpatchMerge branch 'restart-fix-for-mix-tasks' into 'develop'
2020-03-06 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-04 feldMerge branch 'exclude-reblogs-from-admin-api-by-default...
2020-03-04 lainMerge branch 'fix/no-email-no-fail' into 'develop'
2020-03-03 Mark FelderMerge branch 'develop' into gun
2020-03-03 HaelwennMerge branch 'chore/update-copyrights' into 'develop'
2020-03-03 Mark FelderUpdate Copyrights
2020-01-28 lainMerge branch 'translation/errors-french' into 'develop'
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 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-10-07 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-04 lainMerge branch 'featrue/job-monitor' into 'develop'
2019-10-02 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-10-02 kaniiniMerge branch 'feature/send-identifier-on-oauth-error...
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 lainMerge remote-tracking branch 'origin/develop' into...
2019-09-30 kaniiniMerge branch 'features/apc2s-media-upload' into 'develop'
2019-09-30 kaniiniMerge branch 'split-masto-api/reports' into 'develop'
2019-09-30 kaniiniMerge branch 'split-masto-api/conversations' into ...
2019-09-30 kaniiniMerge branch 'cleanup/drop-subscription-table-if-exists...
2019-09-30 kaniiniMerge branch 'feature/scrobbling' into 'develop'
2019-09-30 Ariadne Conillchange new scrobble endpoint
2019-09-30 Ariadne Conillsplit scrobble functions into their own controller