Merge remote-tracking branch 'origin/develop' into manifest
[akkoma] / lib / pleroma / html.ex
2021-11-15 lainMerge branch 'block-behavior' into 'develop'
2021-08-08 HaelwennMerge branch 'release/2.4.0' into 'stable'
2021-08-04 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-27 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-27 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-18 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-17 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-14 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-14 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-12 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-07 feldMerge branch 'develop' into 'fix/prune-hashtags'
2021-06-05 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-04 Sean KingFix merge conflicts with upstream
2021-06-04 HaelwennMerge branch 'tests/openapi-everywhere' into 'develop'
2021-06-02 feldMerge branch 'Snow-develop-patch-01683' into 'develop'
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 HaelwennMerge branch 'features/validators-note' into 'develop'
2021-05-31 HaelwennMerge branch 'docs/goto-libera' into 'develop'
2021-05-30 Alex GleasonMerge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f...
2021-05-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 feldMerge branch 'cycles-views' into 'develop'
2021-05-29 feldMerge branch 'cycles-html' into 'develop'
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonBreak out activity-specific HTML functions into Pleroma...
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-29 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable'
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop'
2021-01-20 feldMerge branch 'deprecate-public_endpoint' into 'develop'
2021-01-19 rinpatchMerge branch 'stable' into mergeback/2.2.2
2021-01-15 HaelwennMerge branch 'optimize-command_available' into 'develop'
2021-01-13 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-01-13 HaelwennMerge branch 'chores/bump-copyright' into 'develop'
2021-01-13 Haelwenn (lanodan... Bump Copyright to 2021
2021-01-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-01-08 lainMerge branch 'fix/missing_emoji_steal_dir' into 'develop'
2021-01-07 lainMerge branch 'cleanup/unused-proxy-opts' into 'develop'
2021-01-07 lainMerge branch 'object-normalize-refactor' into 'develop'
2021-01-06 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-01-05 feldMerge branch 'fix/mediaproxy-config-descriptions' into...
2021-01-05 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2021-01-04 lainObject: Rework how Object.normalize works
2020-12-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-28 HaelwennMerge branch 'features/hashtag-column' into 'develop'
2020-12-26 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-12-26 lainMerge branch 'cachex-test' into 'develop'
2020-12-18 lainCachex: Make caching provider switchable at runtime.
2020-11-21 feldMerge branch 'libmagic' into 'develop'
2020-11-04 lainMerge branch 'default-mrf' into 'develop'
2020-10-29 HaelwennMerge branch 'issue/2069' into 'develop'
2020-10-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-09-22 Maksim PechnikovMerge branch 'develop' into issue/1975
2020-09-17 Maksim PechnikovMerge branch 'develop' into issue/2099
2020-09-10 Mark FelderMerge branch 'develop' into feature/gen-magic
2020-09-09 Mark FelderMerge branch 'develop' into media-preview-proxy
2020-09-08 rinpatchMerge branch 'release/2.1.1' into 'stable'
2020-09-08 lainMerge branch 'fix/rich-media-fake-statuses' into 'develop'
2020-09-08 rinpatchMerge branch 'feat/rich-media-improvements' into 'develop'
2020-09-07 rinpatchMerge branch 'temp-hackney-fix' into 'develop'
2020-09-07 rinpatchMerge branch 'bugfix/favicon-too-long' into 'develop'
2020-09-07 lainMerge branch 'fix/rich-media-fake-statuses' into 'develop'
2020-09-05 rinpatchRich Media: Do not cache URLs for preview statuses
2020-09-03 Mark FelderMerge branch 'develop' into media-preview-proxy
2020-09-03 lainMerge branch 'bugfix/incoming-poll-emoji' into 'develop'
2020-09-03 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-09-02 lainMerge branch 'fix/1991-tzdata-update' into 'develop'
2020-09-02 lainMerge branch 'bugfix/mastoapi-lists' into 'develop'
2020-09-02 rinpatchMerge branch 'feat/rich-media-improvements' into 'develop'
2020-09-02 rinpatchhtml.ex: optimize external url extraction
2020-08-28 lainMerge branch 'release/2.1.0' into 'stable'
2020-08-25 lainMerge branch 'stable' of git.pleroma.social:pleroma...
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-09 lainMerge branch '1723-token-fixes' into 'develop'
2020-07-06 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-06 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-03 Mark FelderMerge branch 'develop' into issue/1790-updated-oban
2020-07-03 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-02 Mark FelderMerge branch 'develop' into feature/1885-MRF-metadata
2020-07-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-07-02 lainMerge branch 'feature/update-description' into 'develop'
2020-06-30 Mark FelderMerge branch 'develop' into activation-meta
2020-06-30 lainMerge branch 'preload-fixups-2' into preloadfixups
2020-06-29 rinpatchMerge branch 'fix-notification-filtering' into 'develop'
2020-06-29 lainMerge branch 'rich-media-parser-exclude-attachment...
2020-06-29 Alexander Strizhakovexcluding attachment links from RichMedia
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
2020-05-14 lainMerge branch 'features/openrc-console' 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-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'
next