projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'tests/improve-test-coverage' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
media_proxy
/
2019-07-19
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
tree
|
commitdiff
2019-07-16
rinpatch
Merge branch 'bugfix/poll-id-as-string' into 'develop'
tree
|
commitdiff
2019-07-15
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
tree
|
commitdiff
2019-07-15
feld
Merge branch 'match-file-name' into 'develop'
tree
|
commitdiff
2019-07-15
kaniini
Merge branch 'sha512-crypt' into 'develop'
tree
|
commitdiff
2019-07-15
Sachin Joshi
Merge branch 'develop' into match-file-name
tree
|
commitdiff
2019-07-15
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-07-14
kaniini
Merge branch 'tests/media_proxy' into 'develop'
tree
|
commitdiff
2019-07-14
Maksim
added tests for Web.MediaProxy
tree
|
commitdiff
2019-07-12
rinpatch
Merge branch 'develop' into fix/ap-hide-follows
tree
|
commitdiff
2019-07-12
Sachin Joshi
try to always match the filename for proxy url
tree
|
commitdiff
2019-07-12
kaniini
Merge branch 'url-parser-proxy' into 'develop'
tree
|
commitdiff
2019-07-12
Sachin Joshi
preserve the original path/filename (no encoding/decodi...
tree
|
commitdiff
2019-07-11
Egor Kislitsyn
Merge branch 'develop' into feature/addressable-lists
tree
|
commitdiff
2019-07-09
Ivan Tashkinov
[#878] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-07-09
kaniini
Merge branch 'remove-avatar-header' into 'develop'
tree
|
commitdiff
2019-07-09
Mark Felder
Merge branch 'develop' into feature/allow-user-query...
tree
|
commitdiff
2019-07-09
kaniini
Merge branch 'remove-swift' into 'develop'
tree
|
commitdiff
2019-07-09
kaniini
Merge branch 'features/sec-websocket-protocol-header...
tree
|
commitdiff
2019-07-09
Haelwenn
Merge branch 'enable-ogp-by-default' into 'develop'
tree
|
commitdiff
2019-07-09
feld
Merge branch 'proxy-error' into 'develop'
tree
|
commitdiff
2019-07-09
Mark Felder
Merge branch 'develop' into proxy-error
tree
|
commitdiff
2019-07-07
Sachin Joshi
make sure the url used by proxy is same as origin url
tree
|
commitdiff
2019-06-23
Sachin Joshi
Merge branch 'develop' into 'remove-avatar-header'
tree
|
commitdiff
2019-06-04
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-06-03
Mark Felder
Merge branch 'develop' into update-oauth-template
tree
|
commitdiff
2019-06-03
lambda
Merge branch 'align-mastodon-conversations' into 'develop'
tree
|
commitdiff
2019-06-02
kaniini
Merge branch 'feature/notification-control-part-2'...
tree
|
commitdiff
2019-06-01
rinpatch
Resolve merge conflicts
tree
|
commitdiff
2019-06-01
kaniini
Merge branch 'bugfix/visibility-indicator-litepub-dm...
tree
|
commitdiff
2019-05-31
Haelwenn
Merge branch 'dokku' into 'develop'
tree
|
commitdiff
2019-05-31
lambda
Merge branch 'hotfix/leaking-lists' into 'develop'
tree
|
commitdiff
2019-05-30
lambda
Merge branch 'use-pleroma-config' into 'develop'
tree
|
commitdiff
2019-05-30
Egor Kislitsyn
Use Pleroma.Config everywhere
tree
|
commitdiff
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-05-07
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-05-04
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-05-01
Mark Felder
Merge branch 'develop' into update-oauth-template
tree
|
commitdiff
2019-05-01
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-05-01
lambda
Merge branch 'features/download-mastofe-build' into...
tree
|
commitdiff
2019-05-01
Alex S
Merging with develop
tree
|
commitdiff
2019-04-30
Sachin Joshi
Merge branch 'develop' into bugfix/web-notification...
tree
|
commitdiff
2019-04-26
lambda
Merge branch 'feature/807-bookmark-endpoint-extension...
tree
|
commitdiff
2019-04-26
kaniini
Merge branch 'feature/mastoapi-new-config' into 'develop'
tree
|
commitdiff
2019-04-25
kaniini
Merge branch 'feature/mediaproxy-whitelist' into 'develop'
tree
|
commitdiff
2019-04-25
Mark Felder
Add mediaproxy whitelist capability
tree
|
commitdiff
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
tree
|
commitdiff
2019-04-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
tree
|
commitdiff
2019-04-11
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'features/pleroma-tan' into 'develop'
tree
|
commitdiff
2019-04-02
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-03-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-03-14
rinpatch
Merge develop to bump elixir version in the CI so I...
tree
|
commitdiff
2019-03-14
rinpatch
Merge branch 'hotfix/delete-activities' into 'develop'
tree
|
commitdiff
2019-03-14
link0ff
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2019-03-13
kaniini
Merge branch 'mastofe-content-types' into 'develop'
tree
|
commitdiff
2019-03-13
lambda
Merge 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 Felder
Merge branch 'develop' into fix/twittercards
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'feature/jobs' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'feature/add-oauth-tokens-endpoint' into...
tree
|
commitdiff
2019-02-17
lambda
Merge 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
lambda
Merge branch 'bugfix/oauth-token-padding' into 'develop'
tree
|
commitdiff
2019-02-15
rinpatch
Merge branch 'hellthread-filter-fix' into 'develop'
tree
|
commitdiff
2019-02-14
lambda
Merge branch 'bugfix/activitypub-reserialization' into...
tree
|
commitdiff
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2019-02-14
href
Merge branch 'fix/mediaproxy-s3' into 'develop'
tree
|
commitdiff
2019-02-14
Egor Kislitsyn
fix S3 links encoding in Mediaproxy
tree
|
commitdiff
2019-02-11
Karen Konou
Merge branch 'develop' into feature/thread-muting
tree
|
commitdiff
2019-02-11
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-02-10
kaniini
Merge branch 'update-mastofe/glitch-soc-2019-02-10...
tree
|
commitdiff
2019-02-10
kaniini
Merge branch 'feather_mention' into 'develop'
tree
|
commitdiff
2019-02-10
kaniini
Merge branch 'fix/credo-issues' into 'develop'
tree
|
commitdiff
2019-02-09
Haelwenn (lanodan...
Make credo happy
tree
|
commitdiff
2019-01-13
rinpatch
Resolve merge conflict
tree
|
commitdiff
2019-01-05
kaniini
Merge branch 'fix_486' into 'develop'
tree
|
commitdiff
2019-01-03
rinpatch
Merge branch 'captcha' into 'develop'
tree
|
commitdiff
2019-01-01
lambda
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
tree
|
commitdiff
2019-01-01
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2018-12-31
kaniini
Merge branch 'features/admin-api-user-views' into ...
tree
|
commitdiff
2018-12-31
kaniini
Merge branch 'docs/admin-api' into 'develop'
tree
|
commitdiff
2018-12-31
kaniini
Merge branch 'maintenance/copyright-2019' into 'develop'
tree
|
commitdiff
2018-12-31
William Pitcock
update copyright years to 2019
tree
|
commitdiff
2018-12-28
kaniini
Merge branch 'systemd-drop-sysadmin-privilege' into...
tree
|
commitdiff
2018-12-27
kaniini
Merge branch 'feature/create-tombstone-instead-of-delet...
tree
|
commitdiff
2018-12-25
lambda
Merge branch 'legal-boilerplate' into 'develop'
tree
|
commitdiff
2018-12-23
William Pitcock
add license boilerplate to pleroma core
tree
|
commitdiff
2018-12-18
lambda
Merge branch 'feature/new-user-routes' into 'develop'
tree
|
commitdiff
2018-12-14
href
Merge branch 'feature/file-size-checking' into 'develop'
tree
|
commitdiff
2018-12-10
lambda
Merge branch 'fix_empty_bio_crash' into 'develop'
tree
|
commitdiff
2018-12-10
lambda
Merge branch 'fix/config-md-typos' into 'develop'
tree
|
commitdiff
2018-12-10
lambda
Merge branch 'support/bugfix_272' into 'develop'
tree
|
commitdiff
2018-12-10
lambda
Merge branch 'fix/theora-detection-read-bytes' into...
tree
|
commitdiff
2018-12-10
lambda
Merge branch 'anonymize-filter-text' into 'develop'
tree
|
commitdiff
2018-12-10
lambda
Merge branch 'develop' into 'fix/mix-task-uploads-modul...
tree
|
commitdiff
2018-12-10
lambda
Merge branch 'parallel588/pleroma-support/compile_warni...
tree
|
commitdiff
2018-12-10
Maksim Pechnikov
updates
tree
|
commitdiff
2018-12-09
Maksim Pechnikov
fix compile warnings
tree
|
commitdiff
2018-12-08
lambda
Merge branch 'fix/add-upload.ex' into 'develop'
tree
|
commitdiff
next