Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
[akkoma] / lib / pleroma / web / media_proxy / media_proxy_controller.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 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-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-05-21 Ivan Tashkinov[#2497] Image preview proxy: image resize & background...
2020-05-20 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-20 Ivan Tashkinov[#2497] Image preview proxy: implemented ffmpeg-based...
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 Ivan Tashkinov[#2497] Added support for :eimp for image resizing.
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-10 lainMerge branch 'shortening-modules-name' into 'develop'
2020-05-08 Ivan TashkinovInitial implementation of image preview proxy. Media...
2020-05-05 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-05-02 rinpatchMerge branch 'feature/1710-consolidate-instance-info...
2020-05-01 lainMerge branch 'issue/1577' into 'develop'
2020-05-01 Maksim PechnikovMerge branch 'develop' into issue/1276-2
2020-04-30 lainMerge branch '1364-no-pushes-from-blocked-domains-users...
2020-04-30 Egor KislitsynMerge branch 'develop' into openapi/notifications
2020-04-30 Egor KislitsynMerge branch 'develop' into openapi/reports
2020-04-29 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-04-29 lainMerge branch 'automatic-authentication-and-instance...
2020-04-28 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-22 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-22 lainMerge branch 'docs/debian-packages' into 'develop'
2020-04-21 Ivan Tashkinovchecks of authentication / instance publicity. Definiti...
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
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-07-20 rinpatchResolve merge conflicts
2019-07-19 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-18 Maxim FilippovMerge branch 'develop' into feature/admin-api-user...
2019-07-16 Roman ChvanikovMerge develop
2019-07-16 rinpatchMerge branch 'bugfix/poll-id-as-string' into 'develop'
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-15 feldMerge branch 'match-file-name' into 'develop'
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