Merge branch 'develop' into issue/1276-2
[akkoma] / lib / pleroma / web / pleroma_api / controllers / emoji_api_controller.ex
2020-05-01 Maksim PechnikovMerge branch 'develop' into issue/1276-2
2020-04-30 rinpatchMerge branch 'update/admin-fe-20200429' into 'develop'
2020-04-30 lainMerge branch 'tests/more-apc2s' into 'develop'
2020-04-30 lainMerge branch 'dismiss-notification-on-follow-request...
2020-04-30 HaelwennMerge branch 'emoji-upload' into 'develop'
2020-04-30 Alexander Strizhakovfix for auth check
2020-04-30 Alexander Strizhakoverror rename
2020-04-30 Alexander Strizhakovemoji api packs changes in routes with docs update
2020-04-30 Alexander Strizhakovrefactor emoji api with fixes
2020-04-30 Alexander Strizhakovreturn data only for updated emoji
2020-04-30 lainMerge branch '1364-no-pushes-from-blocked-domains-users...
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-21 Ivan Tashkinovchecks of authentication / instance publicity. Definiti...
2020-03-19 lainMerge branch 'remake-remodel' 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-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-02 lainMerge branch 'prepared-statements-settings' into 'develop'
2020-03-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-02-29 Alexander StrizhakovMerge branch 'develop' into gun
2020-02-26 lainMerge branch 'feat/instance-gen-improvements' into...
2020-02-25 rinpatchMerge branch 'fix/dialyzer-warnings' into 'develop'
2020-02-25 Egor KislitsynFix Dialyzer warnings
2020-02-20 lainMerge branch 'require-signature' into 'develop'
2020-02-20 lainMerge branch 'features/remote-follow-userpage-redirect...
2020-02-20 lainMerge branch 'docs_updating' into 'develop'
2020-02-11 Egor KislitsynMerge branch 'develop' into feature/new-registrations...
2020-02-11 lainMerge branch 'docs/kyclos' into 'develop'
2020-02-10 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-02-06 feldMerge branch 'mastoapi-non-html-strings' into 'develop'
2020-02-05 rinpatchMerge branch 'feature/restart-pleroma-from-outside...
2020-02-05 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-02-03 Maksim PechnikovMerge branch 'develop' into issue/1383
2020-01-30 rinpatchMerge branch 'fix/disable-rate-limiter-for-socket-local...
2020-01-30 rinpatchMerge branch 'develop' into fix/disable-rate-limiter...
2020-01-30 lainMerge branch 'reenable-rate-limit-and-remote-ip' into...
2020-01-30 feldMerge branch 'emoji-api-errors' into 'develop'
2020-01-30 feldUpdate emoji_api_controller.ex
2020-01-29 Alexander Strizhakovemoji api error on not writable dir
2020-01-28 lainMerge branch 'translation/errors-french' into 'develop'
2020-01-27 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-01-22 rinpatchMerge branch 'no-error-404' into 'develop'
2020-01-20 lainMerge branch 'fix-admin-api-scope' into 'develop'
2020-01-15 Egor KislitsynMerge branch 'develop' into notifications-from-account
2020-01-14 Maksim PechnikovMerge branch 'develop' into feature/tag_feed
2020-01-13 Maksim PechnikovMerge branch 'develop' into issue/1383
2020-01-12 feldMerge branch 'updated-at-on-conversation-read' into...
2020-01-12 feldMerge branch 'config/benchmark' into 'develop'
2020-01-12 Mark FelderMerge branch 'develop' into issue/1354
2020-01-12 feldMerge branch 'issue/1487' into 'develop'
2020-01-11 Alexander StrizhakovMerge branch 'develop' into admin-be
2020-01-10 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-01-10 lainMerge branch 'issue/1490' into 'develop'
2020-01-10 lainMerge branch 'oauth-scopes-tweaks-and-tests' into ...
2020-01-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-12-24 HaelwennMerge branch 'feat/doc-improvements' into 'develop'
2019-12-19 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-12-17 Maksim PechnikovMerge branch 'develop' into feature/tag_feed
2019-12-15 Ivan TashkinovOAuthScopesPlug: disallowed nil token (unless with...
2019-12-14 Maksim PechnikovMerge branch 'develop' into issue/1383
2019-12-12 Egor KislitsynMerge branch 'develop' into feature/custom-runtime...
2019-12-11 Maxim FilippovMerge branch 'develop' into feature/report-notes
2019-12-11 Mark FelderMerge branch 'develop' into issue/1411
2019-12-11 rinpatchMerge branch 'chore/fast_sanitize_bump' into 'develop'
2019-12-10 feldMerge branch 'fix/unsubscribe-route' into 'develop'
2019-12-10 SadposterMerge branch 'develop' into 'domain-block-precedence'
2019-12-10 lainMerge branch '1427-oauth-admin-scopes' into 'develop'
2019-12-10 lainMerge branch 'develop' into '1427-oauth-admin-scopes'
2019-12-10 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-12-06 Ivan Tashkinov[#1427] Fixes / improvements of admin scopes support...
2019-12-05 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-12-05 Ivan Tashkinov[#1427] Reworked admin scopes support.
2019-11-29 Ivan Tashkinov[#1427] Initial support for OAuth admin scopes.
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 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 lainMerge remote-tracking branch 'origin/develop' into...
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 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...
next