Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
[akkoma] / lib / pleroma / web / media_proxy / media_proxy.ex
2020-07-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-06-25 feldMerge branch 'preload-data' into 'develop'
2020-06-23 Roman ChvanikovMerge develop
2020-06-23 HaelwennMerge branch 'feature/1631-redesign-mrf-configuration...
2020-06-23 lainMerge branch 'issue/1798' into 'develop'
2020-06-23 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-06-22 lainMerge branch 'feature/1739-account-endpoints' into...
2020-06-22 lainMerge branch 'feature/1854-emoji-pagination' into ...
2020-06-20 lainMerge branch 'bugfix/mix.exs-version-dot-git-less'...
2020-06-20 lainMerge branch 'feature/support-bot-field-in-update-crede...
2020-06-20 lainMerge branch 'develop' into '1865-media-only'
2020-06-19 feldMerge branch 'issue/1855' into 'develop'
2020-06-17 Mark FelderChange references from "deleted_urls" to "banned_urls...
2020-06-17 Mark FelderRemove misleading is_ prefix from boolean function
2020-06-17 Mark FelderMerge branch 'develop' into issue/1855
2020-06-15 Maksim PechnikovMerge branch 'develop' into issue/1855
2020-06-14 Maksim Pechnikovfix invalidates media url's
2020-05-20 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
2020-05-16 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-14 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-14 lainMerge branch 'features/openrc-console' into 'develop'
2020-05-11 Ivan Tashkinov[#2497] Media preview proxy for images: fixes, tweaks...
2020-05-08 Ivan TashkinovInitial implementation of image preview proxy. Media...
2020-04-22 lainMerge branch 'docs/debian-packages' 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-12 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-03-11 feldMerge branch 'fix/signup-without-email' into 'develop'
2020-03-11 feldMerge branch 'relay-list-change' 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'
2020-03-07 rinpatchMerge branch 'restart-fix-for-mix-tasks' into 'develop'
2020-03-06 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-04 feldMerge branch 'exclude-reblogs-from-admin-api-by-default...
2020-03-04 lainMerge branch 'fix/no-email-no-fail' into 'develop'
2020-03-03 Mark FelderMerge branch 'develop' into gun
2020-03-03 HaelwennMerge branch 'chore/update-copyrights' into 'develop'
2020-03-03 Mark FelderUpdate Copyrights
2020-01-28 lainMerge branch 'translation/errors-french' into 'develop'
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-08-24 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-13 rinpatchMerge branch 'length-limit-bio' into 'develop'
2019-08-09 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-08-08 lainMerge branch 'feature/digest-email' into 'develop'
2019-08-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-02 feldMerge branch 'fix/mediaproxy-whitelist-base_url' into...
2019-08-02 feldFix/mediaproxy whitelist base url
2019-07-20 rinpatchResolve merge conflicts
2019-07-18 Maxim FilippovMerge branch 'develop' into feature/admin-api-user...
2019-07-16 Roman ChvanikovMerge develop
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-15 kaniiniMerge branch 'sha512-crypt' into 'develop'
2019-07-15 Sachin JoshiMerge branch 'develop' into match-file-name
2019-07-15 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-07-14 kaniiniMerge branch 'tests/media_proxy' into 'develop'
2019-07-14 Maksimadded tests for Web.MediaProxy
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 Roman ChvanikovMerge develop
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 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 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-30 Roman ChvanikovMerge develop
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
next