projects / akkoma / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / lib / pleroma / web / media_proxy /
2019-08-24 lainMerge branch 'admin-create-users' into 'develop' tree | commitdiff
2019-08-24 lainMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2019-08-13 rinpatchMerge branch 'length-limit-bio' into 'develop' tree | commitdiff
2019-08-09 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop... tree | commitdiff
2019-08-08 lainMerge branch 'feature/digest-email' into 'develop' tree | commitdiff
2019-08-08 lainMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2019-08-07 sadposterMerge branch 'develop' of https://git.pleroma.social... tree | commitdiff
2019-08-02 feldMerge branch 'fix/mediaproxy-whitelist-base_url' into... tree | commitdiff
2019-08-02 feldFix/mediaproxy whitelist base url tree | commitdiff
2019-07-20 rinpatchResolve merge conflicts tree | commitdiff
2019-07-19 Mark FelderMerge branch 'develop' into feature/matstodon-statuses... tree | commitdiff
2019-07-18 Maxim FilippovMerge branch 'develop' into feature/admin-api-user... tree | commitdiff
2019-07-16 Roman ChvanikovMerge develop tree | commitdiff
2019-07-16 sadposterMerge branch 'develop' of https://git.pleroma.social... tree | commitdiff
2019-07-16 rinpatchMerge branch 'bugfix/poll-id-as-string' into 'develop' tree | commitdiff
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses... tree | commitdiff
2019-07-15 feldMerge branch 'match-file-name' into 'develop' tree | commitdiff
2019-07-15 kaniiniMerge branch 'sha512-crypt' into 'develop' tree | commitdiff
2019-07-15 Sachin JoshiMerge branch 'develop' into match-file-name tree | commitdiff
2019-07-15 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-07-14 sadposterMerge branch 'develop' of https://git.pleroma.social... tree | commitdiff
2019-07-14 kaniiniMerge branch 'tests/media_proxy' into 'develop' tree | commitdiff
2019-07-14 Maksimadded tests for Web.MediaProxy tree | commitdiff
2019-07-14 Roman ChvanikovMerge branch 'develop' into feature/digest-email tree | commitdiff
2019-07-13 Maxim FilippovMerge branch 'develop' into feature/admin-api-user... tree | commitdiff
2019-07-12 rinpatchMerge branch 'develop' into fix/ap-hide-follows tree | commitdiff
2019-07-12 Sachin Joshitry to always match the filename for proxy url tree | commitdiff
2019-07-12 kaniiniMerge branch 'url-parser-proxy' into 'develop' tree | commitdiff
2019-07-12 Sachin Joshipreserve the original path/filename (no encoding/decodi... tree | commitdiff
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists tree | commitdiff
2019-07-09 sadposterMerge branch 'develop' of https://git.pleroma.social... tree | commitdiff
2019-07-09 Ivan Tashkinov[#878] Merge remote-tracking branch 'remotes/upstream... tree | commitdiff
2019-07-09 Roman ChvanikovMerge develop tree | commitdiff
2019-07-09 kaniiniMerge branch 'remove-avatar-header' into 'develop' tree | commitdiff
2019-07-09 Mark FelderMerge branch 'develop' into feature/allow-user-query... tree | commitdiff
2019-07-09 kaniiniMerge branch 'remove-swift' into 'develop' tree | commitdiff
2019-07-09 kaniiniMerge branch 'features/sec-websocket-protocol-header... tree | commitdiff
2019-07-09 HaelwennMerge branch 'enable-ogp-by-default' into 'develop' tree | commitdiff
2019-07-09 feldMerge branch 'proxy-error' into 'develop' tree | commitdiff
2019-07-09 Mark FelderMerge branch 'develop' into proxy-error tree | commitdiff
2019-07-07 Sachin Joshimake sure the url used by proxy is same as origin url tree | commitdiff
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header' tree | commitdiff
2019-06-04 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-06-03 Mark FelderMerge branch 'develop' into feature/digest-email tree | commitdiff
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template tree | commitdiff
2019-06-03 lambdaMerge branch 'align-mastodon-conversations' into 'develop' tree | commitdiff
2019-06-02 kaniiniMerge branch 'feature/notification-control-part-2'... tree | commitdiff
2019-06-01 rinpatchResolve merge conflicts tree | commitdiff
2019-06-01 Sachin JoshiMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2019-06-01 kaniiniMerge branch 'bugfix/visibility-indicator-litepub-dm... tree | commitdiff
2019-05-31 HaelwennMerge branch 'dokku' into 'develop' tree | commitdiff
2019-05-31 sadposterMerge branch 'develop' of https://git.pleroma.social... tree | commitdiff
2019-05-31 lambdaMerge branch 'hotfix/leaking-lists' into 'develop' tree | commitdiff
2019-05-30 lambdaMerge branch 'use-pleroma-config' into 'develop' tree | commitdiff
2019-05-30 Egor KislitsynUse Pleroma.Config everywhere tree | commitdiff
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-05-07 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template tree | commitdiff
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into... tree | commitdiff
2019-05-01 Alex SMerging with develop tree | commitdiff
2019-04-30 Sachin JoshiMerge branch 'develop' into bugfix/web-notification... tree | commitdiff
2019-04-30 Roman ChvanikovMerge develop tree | commitdiff
2019-04-29 SadposterMerge branch 'develop' of https://git.pleroma.social... tree | commitdiff
2019-04-26 lambdaMerge branch 'feature/807-bookmark-endpoint-extension... tree | commitdiff
2019-04-26 kaniiniMerge branch 'feature/mastoapi-new-config' into 'develop' tree | commitdiff
2019-04-25 kaniiniMerge branch 'feature/mediaproxy-whitelist' into 'develop' tree | commitdiff
2019-04-25 Mark FelderAdd mediaproxy whitelist capability tree | commitdiff
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction tree | commitdiff
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop' tree | commitdiff
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop' tree | commitdiff
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-03-18 SadposterMerge branch 'develop' of https://git.pleroma.social... tree | commitdiff
2019-03-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop... tree | commitdiff
2019-03-14 rinpatchMerge develop to bump elixir version in the CI so I... tree | commitdiff
2019-03-14 rinpatchMerge branch 'hotfix/delete-activities' into 'develop' tree | commitdiff
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop' tree | commitdiff
2019-03-13 lambdaMerge branch 'features/add-credo-to-ci' into 'develop' tree | commitdiff
2019-03-13 Haelwenn (lanodan... [Credo] fix Credo.Check.Readability.MaxLineLength tree | commitdiff
2019-02-19 Mark FelderMerge branch 'develop' into fix/twittercards tree | commitdiff
2019-02-18 kaniiniMerge branch 'feature/jobs' into 'develop' tree | commitdiff
2019-02-18 kaniiniMerge branch 'feature/add-oauth-tokens-endpoint' into... tree | commitdiff
2019-02-17 lambdaMerge branch 'develop' into 'docs/add-clients-to-ex_doc' tree | commitdiff
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts. tree | commitdiff
2019-02-15 lambdaMerge branch 'bugfix/oauth-token-padding' into 'develop' tree | commitdiff
2019-02-15 rinpatchMerge branch 'hellthread-filter-fix' into 'develop' tree | commitdiff
2019-02-14 lambdaMerge branch 'bugfix/activitypub-reserialization' into... tree | commitdiff
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2019-02-14 hrefMerge branch 'fix/mediaproxy-s3' into 'develop' tree | commitdiff
2019-02-14 Egor Kislitsynfix S3 links encoding in Mediaproxy tree | commitdiff
2019-02-11 Karen KonouMerge branch 'develop' into feature/thread-muting tree | commitdiff
2019-02-11 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2019-02-10 kaniiniMerge branch 'update-mastofe/glitch-soc-2019-02-10... tree | commitdiff
2019-02-10 kaniiniMerge branch 'feather_mention' into 'develop' tree | commitdiff
2019-02-10 kaniiniMerge branch 'fix/credo-issues' into 'develop' tree | commitdiff
2019-02-09 Haelwenn (lanodan... Make credo happy tree | commitdiff
2019-01-13 rinpatchResolve merge conflict tree | commitdiff
next
Fork of https://akkoma.dev/AkkomaGang/akkoma.git