Merge branch 'develop' into issue/2099
[akkoma] / lib / pleroma / emoji.ex
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
2020-05-14 lainMerge branch 'features/openrc-console' into 'develop'
2020-04-22 lainMerge branch 'docs/debian-packages' into 'develop'
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-12-09 lainMerge branch 'exclude-visibilities-for-like-notificatio...
2019-12-05 Maksim PechnikovMerge branch 'develop' into issue/1276
2019-12-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-11-21 lainMerge branch 'issue/1348' into 'develop'
2019-11-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-11-15 rinpatchMerge branch 'bugfix/1395-email-activation' into 'develop'
2019-11-14 Maxim FilippovMerge branch 'develop' into feature/admin-api-list...
2019-11-14 rinpatchMerge branch 'fix/conversations-rendering' into 'develop'
2019-11-14 feldMerge branch 'feature/reports-groups-and-multiple-state...
2019-11-14 Egor KislitsynMerge remote-tracking branch 'upstream/develop' into...
2019-11-14 rinpatchMerge branch 'reactions' into 'develop'
2019-11-10 lainMerge branch 'develop' into 'reactions'
2019-11-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-10 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-10 lainMerge branch 'develop' into 'reactions'
2019-10-07 lainMerge branch 'develop' into 'reactions'
2019-10-07 lainMerge branch 'develop' into 'reactions'
2019-10-07 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-06 lainMerge branch 'develop' into 'reactions'
2019-10-05 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-05 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-02 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-10-02 lainMerge remote-tracking branch 'origin/develop' into...
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 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...
2019-09-26 kaniiniMerge branch 'fix/do-not-embed-first-pages-in-collectio...
2019-09-25 rinpatchMerge branch 'hotfix/hackney-1.15.2' into 'develop'
2019-09-25 rinpatchMerge branch 'support/test' into 'develop'
2019-09-25 lainMerge branch 'issue/1218' into 'develop'
2019-09-25 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-09-24 Maxim FilippovMerge branch 'develop' into feature/return-link-for...
2019-09-23 kaniiniMerge branch 'feature/force-password-reset' into 'develop'
2019-09-23 kaniiniMerge branch 'support-rel-ugc' into 'develop'
2019-09-23 kaniiniMerge branch 'remove-direct-messages-from-public-timeli...
2019-09-23 rinpatchMerge branch 'update-adminfe/2019-09-23' into 'develop'
2019-09-23 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-23 Maksim PechnikovMerge branch 'develop' into test/activity_pub/transmogr...
2019-09-23 rinpatchMerge branch 'better-emoji-packs' into 'develop'
2019-09-18 Ekaterina VaartisChange YAML to JSON
2019-09-18 Ekaterina VaartisClean out old emojis on reload
2019-09-18 Ekaterina VaartisSwap TOML for YAML to get YAML generation for packs...
2019-09-18 Ekaterina VaartisAdd pack.toml loading
2019-09-13 lainEmoji: Generate emoji detecting functions at compile...
2019-09-13 lainMerge remote-tracking branch 'origin/develop' into...
2019-09-13 lainEmoji: Add function to detect if a character is an...
2019-09-07 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-09-06 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-08-31 Maksim Pechnikovadded Emoji struct
2019-08-30 Maksim Pechnikovdivision emoji.ex on loader.ex and emoji.ex
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-08-24 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-22 Ivan Tashkinov[#1149] Merge remote-tracking branch 'remotes/upstream...
2019-08-20 lainMerge branch 'digest-template' into 'develop'
2019-08-20 lainMerge branch 'feature/custom-fields' into 'develop'
2019-08-19 lainMerge branch 'develop' into 'fix/reverse-proxy-body...
2019-08-16 lainMerge branch 'pleroma-conversations' into 'develop'
2019-08-14 Maxim FilippovMerge branch 'develop' into 'fix/admin-api-user-deletion'
2019-08-14 rinpatchMerge branch 'misc-otp-issues' into 'develop'
2019-08-14 stwfuse default child_specs
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-07-09 kaniiniMerge branch 'remove-avatar-header' into 'develop'
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-28 lainMerge branch 'release-docs' into 'develop'
next