projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
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
/
media_proxy.ex
2019-04-29
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2019-04-26
lambda
Merge branch 'feature/807-bookmark-endpoint-extension...
blob
|
commitdiff
|
raw
2019-04-26
kaniini
Merge branch 'feature/mastoapi-new-config' into 'develop'
blob
|
commitdiff
|
raw
2019-04-25
kaniini
Merge branch 'feature/mediaproxy-whitelist' into 'develop'
blob
|
commitdiff
|
raw
2019-04-25
Mark Felder
Add mediaproxy whitelist capability
blob
|
commitdiff
|
raw
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'features/pleroma-tan' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-18
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge develop to bump elixir version in the CI so I...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge branch 'hotfix/delete-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
link0ff
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
kaniini
Merge branch 'mastofe-content-types' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
lambda
Merge branch 'features/add-credo-to-ci' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
Haelwenn (lanodan...
[Credo] fix Credo.Check.Readability.MaxLineLength
blob
|
commitdiff
|
raw
|
diff to current
2019-02-19
Mark Felder
Merge branch 'develop' into fix/twittercards
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'feature/jobs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'feature/add-oauth-tokens-endpoint' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
lambda
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-15
lambda
Merge branch 'bugfix/oauth-token-padding' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-15
rinpatch
Merge branch 'hellthread-filter-fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
lambda
Merge branch 'bugfix/activitypub-reserialization' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
href
Merge branch 'fix/mediaproxy-s3' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
Egor Kislitsyn
fix S3 links encoding in Mediaproxy
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Karen Konou
Merge branch 'develop' into feature/thread-muting
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'update-mastofe/glitch-soc-2019-02-10...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'feather_mention' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'fix/credo-issues' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
Haelwenn (lanodan...
Make credo happy
blob
|
commitdiff
|
raw
|
diff to current
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/config-md-typos' 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-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-07
href
Media proxy: fix url encoding
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-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
reverse proxy / uploads
blob
|
commitdiff
|
raw
|
diff to current
2018-11-30
lain
Merge remote-tracking branch 'origin' into validate...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-27
kaniini
Merge branch 'ogg-theora-detection' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-22
kaniini
Merge branch 'feature/admin-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-21
kaniini
Merge branch 'feature/improve-version' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-20
kaniini
Merge branch 'runtime-fixes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-20
Haelwenn
Merge branch 'feature/retry-queue' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-20
kaniini
Merge branch 'fix/mediaproxy-empty-url' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-20
href
mediaproxy: fix empty url & add some tests
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-02-11
Roger Braun
Merge branch 'develop' into feature/activitypub
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
proxy emojis
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-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
media proxy: good enough wip
blob
|
commitdiff
|
raw
|
diff to current
projects / akkoma / history