Merge branch 'develop' into 'remove-avatar-header'
[akkoma] / lib / pleroma / formatter.ex
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-06-01 rinpatchResolve merge conflicts
2019-05-31 HaelwennMerge branch 'dokku' into 'develop'
2019-05-24 kaniiniMerge branch 'bugfix/mention-all-people-in-beginning...
2019-05-24 Sergey SuprunenkoMention all people in the beginning of DM
2019-05-23 Sachin Joshifix merge conflict
2019-05-22 lambdaMerge branch 'feature/object-pruning' into 'develop'
2019-05-22 lambdaMerge branch 'refactor/keys' into 'develop'
2019-05-22 rinpatchMerge branch 'bugfix/account_view_source.note' into...
2019-05-22 kaniiniMerge branch 'mongooseim-support' into 'develop'
2019-05-22 kaniiniMerge branch 'fix/api-fallback' into 'develop'
2019-05-22 kaniiniMerge branch 'bugfix/dm-being-truncated' into 'develop'
2019-05-22 Sergey SuprunenkoDo not truncate DM when it contains newlines and safe_d...
2019-05-07 lambdaMerge branch 'conversations_three' into 'develop'
2019-05-07 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-03 rinpatchMerge branch 'fix/embeded-relationship-in-follows'...
2019-05-03 rinpatchMerge branch 'fix-search-speed' into 'develop'
2019-05-03 lambdaMerge branch 'bugfix/emoji-size' into 'develop'
2019-05-03 Haelwenn (lanodan... formatter.ex: Add get_emoji_map/1
2019-05-03 Haelwenn (lanodan... Pleroma.Formatter: width/height to class=emoji
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into...
2019-05-01 Alex SMerging with develop
2019-04-22 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-19 lambdaMerge branch '923_oauth_consumer_refactoring_ci' into...
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-13 HaelwennMerge branch 'docs/changelog' into 'develop'
2019-04-13 Alex SMerge develop to 788-separate-email-addresses
2019-04-12 HaelwennMerge branch 'improve-formatter' into 'develop'
2019-04-12 EgorRevert "simplify mentions escape"
2019-04-12 lambdaMerge branch 'features/mastoapi/2.6.0-min_id-pagination...
2019-04-12 lambdaMerge branch 'fix/732-password-align' into 'develop'
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-10 lambdaMerge branch 'feature/767-multiple-use-invite-token...
2019-04-10 SadposterMerge branch 'develop' into feature/user-status-subscri...
2019-04-10 kaniiniMerge branch 'hotfix/fix_undefined_summary' into 'develop'
2019-04-10 kaniiniMerge branch 'notification-pleroma-settings' into ...
2019-04-09 lambdaMerge branch 'bugfix/follower_count' into 'develop'
2019-04-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-08 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-08 lambdaMerge branch 'improve_upgrade_user_from_ap_id' into...
2019-04-08 lambdaMerge branch 'twitter_oauth' into 'develop'
2019-04-08 lambdaMerge branch 'feature/770-add-emoji-tags' into 'develop'
2019-04-06 Alex SMerge develop to 770-add-emoji-tags
2019-04-02 Alex SMerging develop into feature/770-add-emoji-tags
2019-04-02 Alex SMerge develop into feature/770-add-emoji-tags
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-04-01 Alex SAdding tag to emoji ets table
2019-03-27 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-03-25 lainMerge remote-tracking branch 'origin/develop' into...
2019-03-24 rinpatchMerge branch 'fix/eldap-warnings' into 'develop'
2019-03-22 kaniiniMerge branch 'safe-mentions' into 'develop'
2019-03-20 lainAdd safe dm mode option.
2019-03-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-14 rinpatchMerge develop to bump elixir version in the CI so I...
2019-03-14 rinpatchMerge branch 'hotfix/delete-activities' into 'develop'
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop'
2019-03-13 lambdaMerge branch 'features/add-credo-to-ci' into 'develop'
2019-03-13 Haelwenn (lanodan... [Credo] fix Credo.Check.Readability.MaxLineLength
2019-03-04 Karen KonouMerge branch 'bugfix/delete-activity-audience' of git...
2019-03-03 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-03 lambdaMerge branch 'fix/dont-show-dms-in-mentions-timeline...
2019-03-02 rinpatchMerge branch 'bugfix/oauth-scopes-join' into 'develop'
2019-03-01 lambdaMerge branch 'bugfix/236-ambiguous-route-for-numerical...
2019-02-28 hrefMerge branch 'customizable_auth' into 'develop'
2019-02-28 hrefMerge branch 'customizable_auth' into 'develop'
2019-02-27 kaniiniMerge branch 'fix/formatter' into 'develop'
2019-02-27 Egor Kislitsynfix formatter
2019-02-26 kaniiniMerge branch 'auto_linker' into 'develop'
2019-02-26 EgorAutoLinker
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-11 Karen KonouMerge branch 'develop' into feature/thread-muting
2019-02-11 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-10 kaniiniMerge branch 'update-mastofe/glitch-soc-2019-02-10...
2019-02-10 kaniiniMerge branch 'feather_mention' into 'develop'
2019-02-10 kaniiniMerge branch 'fix/credo-issues' into 'develop'
2019-02-09 Haelwenn (lanodan... de-group alias/es
2019-02-09 Haelwenn (lanodan... Credo fixes: alias grouping/ordering
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop'
2019-01-29 kaniiniMerge branch 'hj-happiness-improvement' into 'develop'
2019-01-28 Ivan Tashkinov[#534] Merged `upstream/develop`.
2019-01-26 kaniiniMerge branch 'documentation/mastalab' into 'develop'
2019-01-25 kaniiniMerge branch 'oembed_provider' into 'develop'
2019-01-25 rinpatchMerge remote-tracking branch 'pl/develop' into oembed_p...
2019-01-25 kaniiniMerge branch 'fix/tusky-dm' into 'develop'
2019-01-25 kaniiniMerge branch 'develop' into 'oembed_provider'
2019-01-23 kaniiniMerge branch 's3-namespace' into 'develop'
2019-01-20 lambdaMerge branch 'add-custom-emoji-test' into 'develop'
2019-01-20 lambdaMerge branch '2019-1-20-update-frontend' into 'develop'
2019-01-20 lambdaMerge branch 'i1t/pleroma-477_user_search_improvements...
2019-01-19 kaniiniMerge branch 'bugfix/improve-boost-targeting' into...
2019-01-19 kaniiniMerge branch '491_full_mentions_in_user_bio' into ...
next