Merge branch 'develop' into feature/addressable-lists
[akkoma] / lib / pleroma / web / media_proxy /
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-07-09 Ivan Tashkinov[#878] Merge remote-tracking branch 'remotes/upstream...
2019-07-09 kaniiniMerge branch 'remove-avatar-header' into 'develop'
2019-07-09 Mark FelderMerge branch 'develop' into feature/allow-user-query...
2019-07-09 kaniiniMerge branch 'remove-swift' into 'develop'
2019-07-09 kaniiniMerge branch 'features/sec-websocket-protocol-header...
2019-07-09 HaelwennMerge branch 'enable-ogp-by-default' into 'develop'
2019-07-09 feldMerge branch 'proxy-error' into 'develop'
2019-07-09 Mark FelderMerge branch 'develop' into proxy-error
2019-07-07 Sachin Joshimake sure the url used by proxy is same as origin url
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-04 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
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 kaniiniMerge branch 'bugfix/visibility-indicator-litepub-dm...
2019-05-31 HaelwennMerge branch 'dokku' into 'develop'
2019-05-31 lambdaMerge branch 'hotfix/leaking-lists' into 'develop'
2019-05-30 lambdaMerge branch 'use-pleroma-config' into 'develop'
2019-05-30 Egor KislitsynUse Pleroma.Config everywhere
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
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-26 lambdaMerge branch 'feature/807-bookmark-endpoint-extension...
2019-04-26 kaniiniMerge branch 'feature/mastoapi-new-config' into 'develop'
2019-04-25 kaniiniMerge branch 'feature/mediaproxy-whitelist' into 'develop'
2019-04-25 Mark FelderAdd mediaproxy whitelist capability
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-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-02-19 Mark FelderMerge branch 'develop' into fix/twittercards
2019-02-18 kaniiniMerge branch 'feature/jobs' into 'develop'
2019-02-18 kaniiniMerge branch 'feature/add-oauth-tokens-endpoint' into...
2019-02-17 lambdaMerge branch 'develop' into 'docs/add-clients-to-ex_doc'
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-15 lambdaMerge branch 'bugfix/oauth-token-padding' into 'develop'
2019-02-15 rinpatchMerge branch 'hellthread-filter-fix' into 'develop'
2019-02-14 lambdaMerge branch 'bugfix/activitypub-reserialization' into...
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-14 hrefMerge branch 'fix/mediaproxy-s3' into 'develop'
2019-02-14 Egor Kislitsynfix S3 links encoding in Mediaproxy
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... Make credo happy
2019-01-13 rinpatchResolve merge conflict
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop'
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2019-01-01 lambdaMerge branch 'cleanup/admin-api-useless-if' into 'develop'
2019-01-01 lainMerge remote-tracking branch 'origin/develop' into...
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ...
2018-12-31 kaniiniMerge branch 'docs/admin-api' into 'develop'
2018-12-31 kaniiniMerge branch 'maintenance/copyright-2019' into 'develop'
2018-12-31 William Pitcockupdate copyright years to 2019
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 Pitcockadd license boilerplate to pleroma core
2018-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-10 lambdaMerge branch 'fix_empty_bio_crash' into 'develop'
2018-12-10 lambdaMerge branch 'fix/config-md-typos' into 'develop'
2018-12-10 lambdaMerge branch 'support/bugfix_272' into 'develop'
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
2018-12-10 lambdaMerge branch 'anonymize-filter-text' into 'develop'
2018-12-10 lambdaMerge branch 'develop' into 'fix/mix-task-uploads-modul...
2018-12-10 lambdaMerge branch 'parallel588/pleroma-support/compile_warni...
2018-12-10 Maksim Pechnikovupdates
2018-12-09 Maksim Pechnikovfix compile warnings
2018-12-08 lambdaMerge branch 'fix/add-upload.ex' into 'develop'
2018-12-08 lambdaMerge branch 'fix/nodeinfo-nil-features' into 'develop'
2018-12-08 lambdaMerge branch 'fix/media-proxy-url-encoded' into 'develop'
2018-12-08 lambdaMerge branch 'fix/typo-relay-ex' into 'develop'
2018-12-07 hrefMedia proxy: fix url encoding
2018-12-07 lambdaMerge branch 'fix/gopher-respect-ip' into 'develop'
2018-12-07 lambdaMerge branch 'media-proxy-follow-redirect' into 'develop'
2018-12-07 hrefMedia proxy: follow HTTP redirects by default
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-05 lainMerge remote-tracking branch 'origin' into follower...
2018-12-05 Rin ToshakaMerge develop to refactor/mix-tasks
2018-12-03 lambdaMerge branch 'fix/parse-user-bio' into 'develop'
2018-12-03 lambdaMerge branch 'fix-media-proxy-defaults' into 'develop'
next