projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'media-preview-proxy-nostream' into 'develop'
[akkoma]
/
test
/
web
/
media_proxy
/
media_proxy_test.exs
2020-09-18
feld
Merge branch 'media-preview-proxy-nostream' into 'develop'
blob
|
commitdiff
|
raw
2020-09-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2020-09-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2020-09-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2020-09-11
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2020-09-09
Mark Felder
Merge branch 'develop' into media-preview-proxy
blob
|
commitdiff
|
raw
2020-09-06
Mark Felder
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2020-09-03
Mark Felder
Merge branch 'develop' into media-preview-proxy
blob
|
commitdiff
|
raw
2020-08-30
Mark Felder
Merge branch 'develop' into feld-2168-media-preview...
blob
|
commitdiff
|
raw
2020-08-28
lain
Merge branch 'release/2.1.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-26
Mark Felder
Merge branch 'develop' into feld-2168-media-preview...
blob
|
commitdiff
|
raw
2020-08-25
Mark Felder
Merge branch 'develop' into feld-2168-media-preview...
blob
|
commitdiff
|
raw
2020-08-25
lain
Merge branch 'stable' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-18
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2020-08-12
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2020-08-11
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2020-08-07
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2020-08-05
Roman Chvanikov
Merge branch 'develop' into command-available-check
blob
|
commitdiff
|
raw
|
diff to current
2020-07-27
lain
Merge branch 'develop' into 'cleanup/masto_fe-default_s...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
lain
Merge branch 'bugfix/mrf-reject-logging' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
lain
Merge branch 'issue/1878' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-21
Ivan Tashkinov
[#2497] Resolved merge conflicts.
blob
|
commitdiff
|
raw
2020-07-19
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-16
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-16
Maksim Pechnikov
Merge branch 'develop' into issue/1023
blob
|
commitdiff
|
raw
|
diff to current
2020-07-15
Mark Felder
Merge branch 'develop' into refactor/notification_settings
blob
|
commitdiff
|
raw
|
diff to current
2020-07-15
rinpatch
Merge branch 'features/mrf-reasons' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-15
lain
Merge branch 'tests/apc2s-update_outbox' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-14
feld
Merge branch 'feature/1922-media-proxy-whitelist' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-12
Alexander Strizhakov
MediaProxy whitelist setting now supports hosts with...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-29
Egor Kislitsyn
Merge branch 'develop' into remove-twitter-api
blob
|
commitdiff
|
raw
|
diff to current
2020-06-25
Mark Felder
Merge branch 'develop' into refactor/notification_settings
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
lain
Merge branch 'feature/1739-account-endpoints' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-20
lain
Merge branch 'bugfix/mix.exs-version-dot-git-less'...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-09
rinpatch
Merge branch 'release/2.0.6' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-08
Roman Chvanikov
merge develop
blob
|
commitdiff
|
raw
|
diff to current
2020-06-07
rinpatch
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-04
Egor Kislitsyn
Merge branch 'develop' into openapi/admin/config
blob
|
commitdiff
|
raw
|
diff to current
2020-06-02
Egor Kislitsyn
Merge branch 'develop' into openapi/admin/relay
blob
|
commitdiff
|
raw
|
diff to current
2020-06-02
lain
Merge branch 'openapi/admin/oauth-apps' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-02
lain
Merge branch 'tagline' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-02
lain
Merge branch 'openapi/admin/invites' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-02
lain
Merge branch 'feature/status-by-id-account-view' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-30
lain
Merge branch 'conversation-pagination' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-29
rinpatch
Merge branch 'media-docs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-29
feld
Merge branch 'mix/database-vacuum-options' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-29
lain
Merge branch 'fix-relay-repeat-notification' into ...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-29
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-29
rinpatch
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-27
rinpatch
MediaProxy test: use config macros instead of directly...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-20
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-18
lain
Merge branch 'docs/storing-remote-media' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-16
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-14
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-14
lain
Merge branch 'features/openrc-console' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-11
Ivan Tashkinov
[#2497] Media preview proxy for images: fixes, tweaks...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-08
Ivan Tashkinov
Initial implementation of image preview proxy. Media...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-22
lain
Merge branch 'docs/debian-packages' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-10
Haelwenn
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-06
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-06
lain
Merge branch 'remake-remodel-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-29
Haelwenn
Merge branch 'feature/funkwhale-audio' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-29
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2020-03-25
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-24
Haelwenn (lanodan...
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-24
lain
Merge branch 'admin-api-change-password' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-22
rinpatch
Merge branch 'fix/ecto_ssl_option' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-20
Egor Kislitsyn
Merge branch 'develop' into global-status-expiration
blob
|
commitdiff
|
raw
|
diff to current
2020-03-20
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-03-20
lain
Merge branch 'fix-feed-pagination' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-20
lain
Merge branch 'clear-config-test-improvements' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-20
Ivan Tashkinov
Improved in-test `clear_config/n` applicability (setup...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-19
lain
Merge branch 'remake-remodel' into develop
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
rinpatch
Merge branch 'feature/mastofe-admin-scope' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
rinpatch
Merge branch 'docs/direct_conversation_id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
rinpatch
Merge branch 'static-accept-missing' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-09
lain
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-08
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2020-03-08
rinpatch
Merge branch 'release/2.0.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-07
rinpatch
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
|
diff to current
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
|
diff to current
2020-03-04
lain
Merge branch 'fix/no-email-no-fail' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-03
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
lain
Merge branch 'prepared-statements-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Egor Kislitsyn
Merge branch 'develop' into fix/signup-without-email
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Haelwenn
Merge branch 'feature/1482-activity_pub_transactions...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Haelwenn
Merge branch 'chores/bump-copyright' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Haelwenn (lanodan...
Bump copyright years of files changed after 2020-01-07
blob
|
commitdiff
|
raw
|
diff to current
2020-02-25
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2020-02-21
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-02-20
Haelwenn
Merge branch 'migration-fixes-20' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-20
Haelwenn
Merge branch 'single_emoji_reaction' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-20
lain
Merge branch 'require-signature' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next