Merge branch 'refactor/locked_user_field' into 'develop'
[akkoma] / lib / pleroma / web / pleroma_api / controllers / emoji_pack_controller.ex
2020-10-13 Mark FelderMerge branch 'develop' into refactor/locked_user_field
2020-10-13 feldMerge branch 'feature/1822-files-consistency' into...
2020-10-13 Alexander Strizhakovfixes after rebase
2020-10-13 Alexander StrizhakovOAuthScopesPlug module name
2020-10-12 feldMerge branch 'docs/improve-backup-restore' into 'develop'
2020-10-12 feldMerge branch 'improve/instance-gen' into 'develop'
2020-10-12 feldMerge branch 'chore/copyright-headers' into 'develop'
2020-10-12 Mark FelderAdd missing Copyright headers
2020-10-08 HaelwennMerge branch 'fix/2209-remoteip' into 'develop'
2020-10-06 Mark FelderMerge branch 'develop' into revert/rich-media-censorship
2020-10-06 rinpatchMerge branch 'filtering-following' into 'develop'
2020-10-06 rinpatchMerge branch 'feature/update-description-for-frontends...
2020-10-05 feldMerge branch 'feature/1893-remote-emoji-packs-paginatio...
2020-10-05 Mark FelderMerge branch 'develop' into feature/1893-remote-emoji...
2020-09-25 Mark FelderMerge branch 'develop' into fix/deprecation-warning...
2020-09-25 rinpatchMerge branch 'features/incoming-create-exists' into...
2020-09-24 lainMerge branch 'smol-test' into 'develop'
2020-09-24 Alexander Strizhakovpagination for remote emoji packs
2020-09-23 Mark FelderMerge branch 'develop' into feature/bulk-confirmation
2020-09-23 lainMerge branch 'user-query/filter-out-internal' into...
2020-09-23 lainMerge branch 'develop' into 'issue/2115'
2020-09-23 lainMerge branch 'issue/1975' into 'develop'
2020-09-23 lainMerge branch 'develop' into 'issue/1975'
2020-09-22 Maksim PechnikovMerge branch 'develop' into issue/1975
2020-08-28 lainMerge branch 'release/2.1.0' into 'stable'
2020-08-25 HaelwennMerge branch 'buildx-multiarch-arm32v7' into 'develop'
2020-08-25 lainMerge branch 'stable' of git.pleroma.social:pleroma...
2020-08-19 Maksim Pechnikovadded Pleroma.Web.PleromaAPI.EmojiFileController
2020-08-07 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-08-05 Roman ChvanikovMerge branch 'develop' into command-available-check
2020-07-31 Haelwenn (lanodan... Merge remote-tracking branch 'pleroma/develop' into...
2020-07-29 lainMerge branch 'issue/1023' into 'develop'
2020-07-27 lainMerge branch 'develop' into 'cleanup/masto_fe-default_s...
2020-07-26 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-07-23 feldMerge branch 'unblock-domain-via-query' into 'develop'
2020-07-23 feldMerge branch 'feature/add-mrf-related-policies' into...
2020-07-23 HaelwennMerge branch '1976-status-view-fixes' into 'develop'
2020-07-23 Maksim PechnikovMerge branch 'develop' into issue/1934-welcome-email
2020-07-23 lainMerge branch 'bugfix/mrf-reject-logging' into 'develop'
2020-07-23 lainMerge branch 'issue/1878' into 'develop'
2020-07-23 lainMerge branch 'linkify' into 'develop'
2020-07-22 lainMerge branch 'fix/pleroma-api-emoji-packs' into 'develop'
2020-07-21 Mark FelderSkip the correct plug
2020-07-21 Mark FelderMerge branch 'develop' into fix/pleroma-api-emoji-packs
2020-07-18 KokaKiwiFix /api/pleroma/emoji/packs index endpoint.
2020-07-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-06-30 Mark FelderMerge branch 'develop' into activation-meta
2020-06-29 Egor KislitsynMerge branch 'develop' into remove-twitter-api
2020-06-25 feldMerge branch 'preload-data' into 'develop'
2020-06-25 Mark FelderMerge branch 'develop' into refactor/notification_settings
2020-06-23 Roman ChvanikovMerge develop
2020-06-23 HaelwennMerge branch 'feature/1631-redesign-mrf-configuration...
2020-06-23 lainMerge branch 'issue/1798' into 'develop'
2020-06-23 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-06-22 HaelwennMerge branch 'warning/mastofe-settings-blob' into ...
2020-06-22 lainMerge branch 'feature/1739-account-endpoints' into...
2020-06-22 lainMerge branch 'fix/1825-admin-api-error-codes' into...
2020-06-22 rinpatchMerge branch '1865-media-only' into 'develop'
2020-06-22 rinpatchMerge branch '1883-mrf-chat' into 'develop'
2020-06-22 lainMerge branch 'feature/1854-emoji-pagination' into ...
2020-06-20 lainMerge branch 'bugfix/mix.exs-version-dot-git-less'...
2020-06-19 Alexander Strizhakovadding overall count for packs and files
2020-06-18 Alexander Strizhakovemoji pagination for pack show action
2020-06-18 Alexander Strizhakovemoji packs pagination
2020-06-08 Roman Chvanikovmerge develop
2020-06-02 Egor KislitsynMerge branch 'develop' into openapi/admin/relay
2020-06-02 lainMerge branch 'openapi/admin/oauth-apps' into 'develop'
2020-06-02 lainMerge branch 'tagline' into 'develop'
2020-06-02 lainMerge branch 'openapi/admin/invites' into 'develop'
2020-06-02 lainMerge branch 'feature/status-by-id-account-view' into...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-05-29 rinpatchMerge branch 'media-docs' into 'develop'
2020-05-29 feldMerge branch 'mix/database-vacuum-options' into 'develop'
2020-05-29 lainMerge branch 'fix-relay-repeat-notification' into ...
2020-05-29 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-29 rinpatchMerge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
2020-05-28 lainMerge branch 'feature/1792-update-actor-type' into...
2020-05-28 rinpatchMerge branch 'chore/fix-spelling' into 'develop'
2020-05-27 Mark FelderFix minor spelling error
2020-05-22 HaelwennMerge branch 'announce-validator' into 'develop'
2020-05-22 HaelwennMerge branch '1113-op-mentioning' into 'develop'
2020-05-21 lainMerge branch 'features/emoji_stealer' into 'develop'
2020-05-21 lainMerge branch 'openapi/pleroma-api/pleroma' 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 HaelwennMerge branch 'chore/update-config-fe' into 'develop'
2020-05-20 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-20 lainMerge branch 'openapi/pleroma-api/emojis' into 'develop'
2020-05-18 Egor KislitsynRename EmojiAPIController to EmojiPackController