Merge branch 'develop' into oembed_provider
[akkoma] / lib / pleroma / formatter.ex
2018-12-18 raenoMerge branch 'develop' into oembed_provider
2018-12-16 HaelwennMerge branch 'develop' into 'develop'
2018-12-16 ealMerge branch 'fix/masto-put-settings' into 'develop'
2018-12-15 lambdaMerge branch 'fix/views-ignore-unhandled-activites...
2018-12-15 lambdaMerge branch 'tests-warning-as-errors' into 'develop'
2018-12-14 hrefMerge branch 'fix/issue_433' into 'develop'
2018-12-14 raenoMerge branch 'develop' into oembed_provider
2018-12-14 Maksim Pechnikovfixed typo
2018-12-14 Maksim Pechnikovfix markdown formatting
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-14 hrefMerge branch '114_user_registration_emails' into 'develop'
2018-12-13 raenoRemove oembed for now, will submit it in another MR...
2018-12-13 raenoWIP. Implement oembed route and handle both json/xml...
2018-12-13 lambdaMerge branch 'username-underscores' into 'develop'
2018-12-12 hrefExtended nicknames: allow dashes.
2018-12-12 hrefAllow underscores in usernames.
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
2018-12-06 Rin ToshakaMerge develop
2018-12-06 kaniiniMerge branch 're-mrf' into 'develop'
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-06 kaniiniMerge branch '210_twitter_api_uploads_alt_text' into...
2018-12-06 Hakaba HitoyoMerge remote-tracking branch 'origin/debug-suggestions...
2018-12-05 kaniiniMerge branch 'follower-hiding' into 'develop'
2018-12-05 kaniiniMerge branch 'dev_vald_fe/data_tag' into 'develop'
2018-12-05 Valdadded data attrs for user and tag
2018-12-05 Rin ToshakaMerge develop to refactor/mix-tasks
2018-12-03 lambdaMerge branch 'fix-media-proxy-defaults' into 'develop'
2018-12-02 rinpatchMerge branch 'develop' into fix/theora-detection-read...
2018-12-01 kaniiniMerge branch 'validate-user-info' into 'develop'
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-12-01 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-11-30 lainMerge remote-tracking branch 'origin' into validate...
2018-11-18 lainFix most User tests.
2018-11-15 Hakaba HitoyoMerge remote-tracking branch 'official/develop' into...
2018-11-10 kaniiniMerge branch 'tests/prismo-url-map' into 'develop'
2018-11-08 lambdaMerge branch 'small-jsonld-refactor' into 'develop'
2018-11-07 kaniiniMerge branch 'feature/qvitter-notifications-dismiss...
2018-11-07 kaniiniMerge branch 'runtime-config' into 'develop'
2018-11-06 kaniiniMerge branch 'patch-2' into 'develop'
2018-11-06 hrefRuntime configuration
2018-11-06 kaniiniMerge branch 'runtime-router' into 'develop'
2018-11-06 kaniiniMerge branch 'use-the-same-example-domain-and-use-it...
2018-11-05 lambdaMerge branch 'runtime-emojis' into 'develop'
2018-11-05 hrefRuntime configured emojis
2018-10-25 kaniiniMerge branch 'finmoji-optional' into 'develop'
2018-10-25 scarlettMake finmoji optional
2018-10-18 kaniiniMerge branch 'bugfix/html-scrub-schemes' into 'develop'
2018-10-18 Haelwenn (lanodan... lib/pleroma/html.ex: Use macros for valid_schemes,...
2018-10-17 kaniiniMerge branch 'bugfix/osada-mention' into 'develop'
2018-10-17 William Pitcockformatter: fix matching osada users
2018-10-07 kaniiniMerge branch 'patch-2' into 'develop'
2018-10-05 kaniiniMerge branch 'revert-d31bbb1c' into 'develop'
2018-10-05 William Pitcockformatter: use Pleroma.HTML module instead of HtmlSanit...
2018-10-05 William PitcockRevert "Merge branch 'revert-a26d5e6b' into 'develop'"
2018-09-30 kaniiniMerge branch 'bugfix/fix-mrf-reject-match' into 'develop'
2018-09-28 HaelwennMerge branch 'bugfix/magnet-links' into 'develop'
2018-09-28 Haelwenn (lanodan... formatter: Stop using phoenix HTML and format it ourselves
2018-09-16 kaniiniMerge branch 'update-pleroma-frontend' into 'develop'
2018-09-16 kaniiniMerge branch 'feature/html-scrub-policy' into 'develop'
2018-09-10 William Pitcockeverywhere: use Pleroma.HTML module instead of HtmlSani...
2018-09-07 kaniiniMerge branch 'add-secure-and-samesite-cookie-flags...
2018-09-07 kaniiniMerge branch 'improve-server-config-examples' into...
2018-09-07 kaniiniMerge branch 'feature/custom_media_url' into 'develop'
2018-09-05 HaelwennMerge branch 'fix/sign-in-with-toot' into 'develop'
2018-09-03 kaniiniMerge branch 'develop' into 'feature/staff-discovery...
2018-09-03 kaniiniMerge branch 'feature/mastodon_api_2.4.x' into 'develop'
2018-09-03 kaniiniMerge branch 'nil-bio-emojis' into 'develop'
2018-09-02 Thurloatsloop around get_emoji/1 to check is_binary and have...
2018-09-02 kaniiniMerge branch 'hotfix_broken_likes' into 'develop'
2018-09-02 kaniiniMerge branch 'security/emoji-xss' into 'develop'
2018-09-02 William Pitcockformatter: don't add XSS emoji
2018-08-31 Thurloatadd nil clause for Formatter.get_emoji/1 to return...
2018-08-31 lambdaMerge branch 'revert-a26d5e6b' into 'develop'
2018-08-31 lambdaRevert "Merge branch 'feature/rich-text' into 'develop'"
2018-08-31 kaniiniMerge branch 'feature/rich-text' into 'develop'
2018-08-31 William Pitcockcommon api: add support for formatting messages outside...
2018-08-27 lambdaMerge branch 'bugfix/announce-timeline-flooding' into...
2018-08-26 kaniiniMerge branch 'feature/emoji-in-local-users' into 'develop'
2018-08-26 kaniiniMerge branch 'develop' into 'feature/relay'
2018-08-24 kaniiniMerge branch 'bugfix/formatter-single-char-nicks' into...
2018-08-24 William Pitcockformatter: adjust regexp captures to match local users...
2018-08-20 ealMerge branch 'fix/redirect-on-user-fetch' into 'develop'
2018-08-16 kaniiniMerge branch 'patch-2' into 'develop'
2018-08-16 kaniiniMerge branch 'dev-lanodan-url-regex' into 'develop'
2018-08-16 kaniiniMerge branch 'mastofe/system-font' into 'develop'
2018-08-16 kaniiniMerge branch 'develop' into 'patch-2'
2018-08-16 kaniiniMerge branch 'fix/put-repeats-at-activitypub-outbox...
2018-08-16 kaniiniMerge branch 'fix/normalize-file-extension' into 'develop'
2018-08-15 lambdaMerge branch 'feature/suggestions-api-with-third-party...
2018-08-12 lambdaMerge branch 'feature/invites' into 'develop'
2018-08-06 lambdaMerge branch 'bugfix/duplicate-follow-requests' into...
2018-08-06 lambdaMerge branch 'feature/camelcase-hashtags' into 'develop'
2018-08-05 William Pitcockformatter: preserve case of hashtags
2018-08-01 Haelwenn (lanodan... Allow additionnal schemes in the config
2018-07-30 Haelwenn (lanodan... [Pleroma.Formatter]: Add support for non-HTTP schemes...
2018-07-13 Tristan MahéMerge remote-tracking branch 'upstream/develop' into...
2018-07-12 lambdaMerge branch 'feature/object-normalization' into 'develop'
2018-07-12 lambdaMerge branch 'feature/mediaproxy-nodeinfo' into 'develop'
2018-07-12 lambdaMerge branch 'feature/default-scope' into 'develop'
next