Merge branch 'develop' into stable
[akkoma] / test / fixtures / rich_media /
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-07-23 Maxim FilippovMerge branch 'develop' into feature/admin-api-user...
2019-07-20 rinpatchResolve merge conflicts
2019-07-20 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-07-19 Roman ChvanikovMerge develop
2019-07-19 feldMerge branch 'feature/matstodon-statuses-by-name' into...
2019-07-19 kaniiniMerge branch 'feature/richmedia-ttl' into 'develop'
2019-07-16 Sachin Joshiadd the rich media ttl based on image exp time
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'
2019-06-26 rinpatchMerge branch 'update-mastofe/glitch-soc-2019-06-26...
2019-06-25 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-06-23 kaniiniMerge branch 'bind-to-localhost' into 'develop'
2019-06-23 kaniiniMerge branch 'rich_media_titles_two' into 'develop'
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-22 lainRich Media Parser: Do not return just a title if nothin...
2019-06-22 lainRevert "Revert "Merge branch 'fix/ogp-title' into ...
2019-06-22 rinpatchMerge branch 'mix_sem_ver_version_fix' into 'develop'
2019-06-21 rinpatchMerge branch 'develop' into release-docs
2019-06-21 kaniiniMerge branch 'feature/mrf-anti-link-spam' into 'develop'
2019-06-21 rinpatchMerge branch 'fix/use-config-when-possible' into 'develop'
2019-06-21 kaniiniMerge branch 'oauth_secure_redirect' into 'develop'
2019-06-21 kaniiniMerge branch 'revert-6f5a0cc1' into 'develop'
2019-06-21 feldRevert "Merge branch 'fix/ogp-title' into 'develop'"
2019-06-16 sadposterMerge branch 'develop' of https://git.pleroma.social...
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-13 rinpatchMerge branch 'develop' into feature/ci-release-build
2019-06-13 lainMerge branch 'fix/ogp-title' into 'develop'
2019-06-13 feldMerge branch 'feld/pleroma-fix/ogp-title' into 'fix...
2019-06-13 Egor KislitsynImprove <title> fallback; Add a test
2019-06-04 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-06-03 Mark FelderMerge branch 'develop' into feature/digest-email
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-06-03 lambdaMerge branch 'align-mastodon-conversations' into 'develop'
2019-06-02 kaniiniMerge branch 'feature/notification-control-part-2'...
2019-06-01 rinpatchResolve merge conflicts
2019-06-01 Sachin JoshiMerge remote-tracking branch 'upstream/develop' into...
2019-06-01 kaniiniMerge branch 'bugfix/visibility-indicator-litepub-dm...
2019-05-31 HaelwennMerge branch 'dokku' into 'develop'
2019-05-31 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-05-31 lambdaMerge branch 'hotfix/leaking-lists' into 'develop'
2019-05-30 feldMerge branch 'fix/ogp-missing-data' into 'develop'
2019-05-30 Sergey SuprunenkoReplace missing non-nullable Card attributes with empty...
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-04 rinpatchMerge branch 'fix/rich-media-relative-path' into 'develop'
2019-02-04 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-01 kaniiniMerge branch 'feature/split-hide-network' into 'develop'
2019-02-01 hrefMerge branch '534_federation_targets_reachability'...
2019-01-31 HaelwennMerge branch 'docs/pleroma-api-invite-token' into ...
2019-01-31 lambdaMerge branch 'bugfix/rich-media-non-unicode' into ...
2019-01-31 William Pitcocktest: add malformed OGP data fixture
2019-01-18 rinpatchFix merge conflict
2019-01-14 rinpatchMerge branch 'media-url-escape' into 'develop'
2019-01-14 lambdaMerge branch 'load-all-dms' into 'develop'
2019-01-14 kaniiniMerge branch 'feature/add-oembed-parser' into 'develop'
2019-01-13 rinpatchResolve merge conflict
2019-01-13 Maxim FilippovAdd OEmbed parser
2019-01-10 kaniiniMerge branch 'activitypub-dereference-activity-id'...
2019-01-10 kaniiniMerge branch 'feature/add-twitter-card-parser' into...
2019-01-10 Maxim FilippovAdd Twitter Card parser
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop'
2019-01-05 scarlettMerge branch 'emoji-in-summary' into 'develop'
2019-01-05 cascodeMerge branch 'develop' of git.pleroma.social:cascode...
2019-01-04 kaniiniMerge branch 'fix/html-cache-content-collision' into...
2019-01-04 kaniiniMerge branch 'feature/rich-media' into 'develop'
2019-01-01 Maxim FilippovAdd OGP parser