projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merge branch 'refactoring/fix_render_view' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
media_proxy
/
controller.ex
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
2019-04-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
blob
|
commitdiff
|
raw
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
blob
|
commitdiff
|
raw
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2019-02-11
Karen Konou
Merge branch 'develop' into feature/thread-muting
blob
|
commitdiff
|
raw
2019-02-11
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2019-02-10
kaniini
Merge branch 'update-mastofe/glitch-soc-2019-02-10...
blob
|
commitdiff
|
raw
2019-02-10
kaniini
Merge branch 'feather_mention' into 'develop'
blob
|
commitdiff
|
raw
2019-02-10
kaniini
Merge branch 'fix/credo-issues' into 'develop'
blob
|
commitdiff
|
raw
2019-02-09
Haelwenn (lanodan...
Make credo happy
blob
|
commitdiff
|
raw
2019-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-05
kaniini
Merge branch 'fix_486' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-03
rinpatch
Merge branch 'captcha' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lambda
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'features/admin-api-user-views' into ...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'docs/admin-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'maintenance/copyright-2019' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
William Pitcock
update copyright years to 2019
blob
|
commitdiff
|
raw
|
diff to current
2018-12-28
kaniini
Merge branch 'systemd-drop-sysadmin-privilege' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-27
kaniini
Merge branch 'feature/create-tombstone-instead-of-delet...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-25
lambda
Merge branch 'legal-boilerplate' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-23
William Pitcock
add license boilerplate to pleroma core
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
lambda
Merge branch 'feature/new-user-routes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch 'feature/file-size-checking' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix_empty_bio_crash' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix/config-md-typos' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'support/bugfix_272' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix/theora-detection-read-bytes' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'anonymize-filter-text' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'develop' into 'fix/mix-task-uploads-modul...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'parallel588/pleroma-support/compile_warni...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
Maksim Pechnikov
updates
blob
|
commitdiff
|
raw
|
diff to current
2018-12-09
Maksim Pechnikov
fix compile warnings
blob
|
commitdiff
|
raw
|
diff to current
2018-12-08
lambda
Merge branch 'fix/add-upload.ex' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-08
lambda
Merge branch 'fix/nodeinfo-nil-features' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-08
lambda
Merge branch 'fix/media-proxy-url-encoded' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-08
lambda
Merge branch 'fix/typo-relay-ex' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-07
href
Media proxy: fix url encoding
blob
|
commitdiff
|
raw
|
diff to current
2018-12-07
lambda
Merge branch 'fix/gopher-respect-ip' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-07
lambda
Merge branch 'media-proxy-follow-redirect' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-07
href
Media proxy: follow HTTP redirects by default
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-05
lain
Merge remote-tracking branch 'origin' into follower...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-05
Rin Toshaka
Merge develop to refactor/mix-tasks
blob
|
commitdiff
|
raw
|
diff to current
2018-12-03
lambda
Merge branch 'fix/parse-user-bio' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-03
lambda
Merge branch 'fix-media-proxy-defaults' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-02
href
Fix media proxy config defaults
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
rinpatch
Attempt to resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-30
kaniini
Merge branch 'feature/reverse-proxy' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-30
href
Config docs
blob
|
commitdiff
|
raw
|
diff to current
2018-11-30
href
reverse proxy / uploads
blob
|
commitdiff
|
raw
|
diff to current
2018-11-16
lambda
Merge branch 'feature/pleromafe-usersearch' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-15
Hakaba Hitoyo
Merge remote-tracking branch 'official/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-14
lambda
Merge branch 'fix-media-proxy-filename' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-14
kaniini
Merge branch 'twitter-api-direct-messages' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-13
href
media_proxy: use path only to retrieve filename
blob
|
commitdiff
|
raw
|
diff to current
2018-11-13
lambda
Merge branch 'media-proxy-safety' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-13
href
media_proxy: CSP, content-disposition
blob
|
commitdiff
|
raw
|
diff to current
2018-05-06
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-10
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-01
KANEKO Yoshitaka
Fix conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-03-30
lain
Format the code.
blob
|
commitdiff
|
raw
|
diff to current
2018-03-20
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-03-20
lambda
Merge branch 'patch-README' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-03-20
lambda
Merge branch 'feld-mastoweb5000' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-03-20
lambda
Merge branch 'feld-Logger' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-03-19
lain
Use connection pools.
blob
|
commitdiff
|
raw
|
diff to current
2018-02-11
Roger Braun
Merge branch 'develop' into feature/activitypub
blob
|
commitdiff
|
raw
|
diff to current
2018-01-30
Roger Braun
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2018-01-30
lambda
Merge branch 'pr-upstream-http-proxy' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-01-24
Jeff Becker
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2017-12-31
Jeff Becker
apply proxy settings to media_proxy
blob
|
commitdiff
|
raw
|
diff to current
2017-12-22
lambda
Merge branch 'media-proxy-fix-encoding' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2017-12-21
href
Remove a useless URI.encode call in MediaProxy
blob
|
commitdiff
|
raw
|
diff to current
2017-12-20
lambda
Merge branch 'media-proxy' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2017-12-12
href
fix content-type and fallback to image/jpeg
blob
|
commitdiff
|
raw
|
diff to current
2017-12-11
href
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2017-12-11
href
Limit body size to 25MB
blob
|
commitdiff
|
raw
|
diff to current
2017-12-05
href
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2017-11-28
href
Improve error handling, add configuration
blob
|
commitdiff
|
raw
|
diff to current
2017-11-28
href
mandatory typo fix...
blob
|
commitdiff
|
raw
|
diff to current
2017-11-28
href
media proxy: good enough wip
blob
|
commitdiff
|
raw
|
diff to current