Merge branch 'develop' into issue/1276
[akkoma] / test / html_test.exs
2019-12-05 Maksim PechnikovMerge branch 'develop' into issue/1276
2019-12-02 lainMerge branch 'feature/move-activity' into 'develop'
2019-11-30 rinpatchMerge branch 'remove-info-from-users' into 'develop'
2019-11-30 rinpatchMerge branch 'benchmarks/favourites_timeline' into...
2019-11-29 lainMerge branch 'fix/extract_first_external_url' into...
2019-11-29 Egor KislitsynFix Pleroma.HTML.extract_first_external_url/2
2019-11-14 Egor KislitsynMerge remote-tracking branch 'upstream/develop' into...
2019-11-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-11-05 Maxim FilippovMerge branch 'develop' into feature/multiple-users...
2019-11-04 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-11-04 Maksim PechnikovMerge branch 'develop' into issue/1276
2019-11-04 lainMerge branch 'transmogrifier-test-errors' into 'develop'
2019-11-04 lainMerge branch 'feature/store-statuses-data-inside-flag...
2019-11-03 rinpatchMerge branch 'bugfix/streamer-follows' into 'develop'
2019-11-03 kaniiniMerge branch 'feature/omit-relay-user' into 'develop'
2019-11-03 kaniiniMerge branch 'feature/fast_sanitize' into 'develop'
2019-10-30 Mark FelderMerge branch 'develop' into feature/fast_sanitize
2019-10-28 rinpatchSwitch from HtmlSanitizeEx to FastSanitize
2019-10-10 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-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 Roman ChvanikovMerge develop
2019-09-26 kaniiniMerge branch 'hex-flake-id' into 'develop'
2019-09-25 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-09-23 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-23 rinpatchMerge branch 'better-emoji-packs' into 'develop'
2019-09-22 Maxim FilippovMerge branch 'develop' into feature/return-link-for...
2019-09-19 HaelwennMerge branch 'docs/clients-update' into 'develop'
2019-09-19 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-09-19 Maksim PechnikovMerge branch 'develop' into test/activity_pub/transmogr...
2019-09-18 HaelwennMerge branch 'issue/733' into 'develop'
2019-09-18 rinpatchMerge branch 'chores/bump-copyright-year' into 'develop'
2019-09-18 Haelwenn (lanodan... Bump copyright years of files changed in 2019
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-21 kaniiniMerge branch 'oauth_secure_redirect' into 'develop'
2019-06-20 rinpatchMerge branch 'feature/release-update-script' into ...
2019-06-19 rinpatchMerge branch 'begone-the-dot-hack' into 'develop'
2019-06-19 lainMerge branch 'fix/rich-media-hashtags-again' into ...
2019-06-18 rinpatchRich Media: Skip Microformats hashtags
2019-06-15 lainMerge branch 'bugfix/980-polls-double-vote' into 'develop'
2019-06-15 kaniiniMerge branch '963_oob_oauth_redirect_fix' into 'develop'
2019-06-14 rinpatchMerge branch 'feature/add-background-image-to-mastoapi...
2019-06-14 lainMerge branch 'fix/hashtag-rich-media' into 'develop'
2019-06-14 rinpatchFix hashtags being picked up by rich media parser
2019-05-07 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
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-30 Sachin JoshiMerge branch 'develop' into bugfix/web-notification...
2019-04-30 Roman ChvanikovMerge develop
2019-04-23 kaniiniMerge branch 'security/fix-html-class-scrubbing' into...
2019-04-23 William Pitcockhtml: lock down allowed class attributes to only those...
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
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-03-25 lainMerge remote-tracking branch 'origin/develop' into...
2019-03-18 kaniiniMerge branch 'feature/order-users-by-nickname-admin...
2019-03-18 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-03-18 kaniiniMerge branch 'feature/allow-link-rel-attribute' into...
2019-03-17 Fong-Wan ChauAllow 'rel' attribute on `<a>` link with specific value...
2019-01-13 rinpatchResolve merge conflict
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-27 kaniiniMerge branch 'feature/create-tombstone-instead-of-delet...
2018-12-25 lambdaMerge branch 'legal-boilerplate' into 'develop'
2018-12-23 William Pitcocktests: add legal boilerplate
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-09-22 kaniiniMerge branch 'feature/html-scrub-policy-tests' into...
2018-09-22 William Pitcocktest: add smoketests for the scrubbing policies