Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / lib / pleroma / emoji /
2020-07-27 lainMerge branch 'develop' into 'cleanup/masto_fe-default_s...
2020-07-16 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-07-13 Mark FelderMerge branch 'develop' into refactor/notification_settings
2020-07-13 feldMerge branch 'features/profile-fields-emojo' into ...
2020-07-13 feldMerge branch 'fix/mediaproxy-cache-settings-types'...
2020-07-10 Mark FelderMerge branch 'develop' into issue/1790-updated-oban
2020-07-10 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-10 lainMerge branch 'mix-tasks-improvement' into 'develop'
2020-07-10 lainMerge branch 'cluster-test-ci' into 'develop'
2020-07-10 HaelwennMerge branch 'develop' into 'admin-api-user-credentials...
2020-07-10 HaelwennMerge branch 'user-search-nickname-rank-boost' into...
2020-07-09 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-07-09 feldMerge branch 'chore/use-the-alias' into 'develop'
2020-07-09 Mark FelderUse the Pleroma.Config alias
2020-07-03 Mark FelderMerge branch 'develop' into issue/1790-updated-oban
2020-06-30 Mark FelderMerge branch 'develop' into activation-meta
2020-06-29 Egor KislitsynMerge branch 'develop' into remove-twitter-api
2020-06-29 lainMerge branch '1031-parent-visible' into 'develop'
2020-06-26 HaelwennMerge branch 'block-handling' into 'develop'
2020-06-26 HaelwennMerge branch '1258-anti-link-spam-exemption' into ...
2020-06-25 feldMerge branch 'preload-data' into 'develop'
2020-06-25 Mark FelderMerge branch 'develop' into refactor/notification_settings
2020-06-25 lainMerge branch 'chore/remove-reference-to-distsn' into...
2020-06-25 lainMerge branch 'fix/following-request-from-deactivated...
2020-06-24 lainMerge branch 'fix-emoji-pagination' into 'develop'
2020-06-24 Alexander Strizhakovfix for emoji pagination in pack show
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-20 Alexander Strizhakovfix for packs pagination
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-06 sadposterMerge branch 'develop' of https://git.pleroma.social...
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 lainMerge branch 'openapi/pleroma-api/emojis' into 'develop'
2020-05-18 Egor KislitsynCleanup Pleroma.Emoji.Pack
2020-05-18 Egor KislitsynAdd OpenAPI spec for PleromaAPI.EmojiAPIController
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-08 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-05-06 lainMerge branch 'plug-if-unless-func-options-refactoring...
2020-05-05 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-05-04 feldMerge branch 'feature/update-labels-for-activating...
2020-05-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-02 rinpatchMerge branch 'feature/1710-consolidate-instance-info...
2020-05-01 lainMerge branch 'openapi/notifications' into 'develop'
2020-05-01 lainMerge branch 'openapi/reports' into 'develop'
2020-05-01 lainMerge branch 'issue/1577' into 'develop'
2020-05-01 lainMerge branch 'fix/captcha' into 'develop'
2020-05-01 lainMerge branch 'feature/delete-validator' of git.pleroma...
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 Lain SoykafMerge branch 'develop' of ssh://git.pleroma.social...
2020-04-30 lainMerge branch 'dismiss-notification-on-follow-request...
2020-04-30 HaelwennMerge branch 'emoji-upload' into 'develop'
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-28 lainMerge branch 'mongoose-secure' into 'develop'
2020-04-22 lainMerge branch 'docs/debian-packages' into 'develop'
2020-04-21 lainMerge branch 'openapi/custom-emojis' into 'develop'
2020-04-21 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-20 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-04-20 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-04-20 Egor KislitsynMerge branch 'develop' into openapi/account
2020-04-20 lainMerge branch 'cleanup-subscription-controller' into...
next