Merge branch 'develop' into feature/gen-magic
[akkoma] / lib / pleroma / web / pleroma_api / controllers / mascot_controller.ex
2020-10-13 Mark FelderMerge branch 'develop' into feature/gen-magic
2020-10-13 feldMerge branch 'feature/1822-files-consistency' into...
2020-10-13 Alexander Strizhakovalias alphabetically order
2020-10-13 Alexander StrizhakovOAuthScopesPlug module name
2020-10-09 Mark FelderMerge branch 'develop' into feature/gen-magic
2020-09-10 Mark FelderMerge branch 'develop' into feature/gen-magic
2020-08-28 lainMerge branch 'release/2.1.0' into 'stable'
2020-08-25 lainMerge branch 'stable' of git.pleroma.social:pleroma...
2020-06-29 Egor KislitsynMerge branch 'develop' into remove-twitter-api
2020-06-22 lainMerge branch 'feature/1739-account-endpoints' into...
2020-06-20 lainMerge branch 'bugfix/mix.exs-version-dot-git-less'...
2020-06-16 hrefUpdate majic & call plug before OpenApiSpex
2020-06-16 hrefSwitch from gen_magic to majic, use Majic.Plug, remove...
2020-06-08 Roman Chvanikovmerge develop
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-05-21 lainMerge branch 'features/emoji_stealer' into 'develop'
2020-05-21 lainMerge branch 'issue/749' into 'develop'
2020-05-21 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-20 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-20 lainMerge branch 'openapi/pleroma-api/emojis' into 'develop'
2020-05-20 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-20 lainMerge branch 'feature/1734-user-deletion' into 'develop'
2020-05-20 HaelwennMerge branch 'exposed-background-image' into 'develop'
2020-05-20 lainMerge branch 'issue/1509' into 'develop'
2020-05-19 lainMerge branch 'deps/update-crypt' into 'develop'
2020-05-19 HaelwennMerge branch 'openapi/pleroma-api/mascot' into 'develop'
2020-05-18 Egor KislitsynAdd OpenAPI spec for MascotController
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
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-05 Egor KislitsynMerge branch 'develop' into global-status-expiration
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 'develop' of git.pleroma.social:pleroma...
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 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-12 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
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-11-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-11-05 lainMerge branch 'develop' of git.pleroma.social:pleroma...
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 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-20 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-19 rinpatchMerge branch 'mix-emoji-task-pack-json' into 'develop'
2019-10-16 Ivan Tashkinov[#1304] Moved all non-mutes / non-blocks fields from...
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 lainMerge remote-tracking branch 'origin/develop' into...
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 kaniiniMerge branch 'split-masto-api/mascots' into 'develop'
2019-09-30 Egor KislitsynExtract mascot actions from `MastodonAPIController...