projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
AccountController: Build the correct update activity.
[akkoma]
/
lib
/
pleroma
/
web
/
media_proxy
/
media_proxy.ex
2020-08-05
Roman Chvanikov
Merge branch 'develop' into command-available-check
blob
|
commitdiff
|
raw
2020-07-27
lain
Merge branch 'develop' into 'cleanup/masto_fe-default_s...
blob
|
commitdiff
|
raw
2020-07-23
lain
Merge branch 'bugfix/mrf-reject-logging' into 'develop'
blob
|
commitdiff
|
raw
2020-07-23
lain
Merge branch 'issue/1878' into 'develop'
blob
|
commitdiff
|
raw
2020-07-16
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2020-07-16
Maksim Pechnikov
Merge branch 'develop' into issue/1023
blob
|
commitdiff
|
raw
2020-07-15
Mark Felder
Merge branch 'develop' into refactor/notification_settings
blob
|
commitdiff
|
raw
2020-07-15
rinpatch
Merge branch 'features/mrf-reasons' into 'develop'
blob
|
commitdiff
|
raw
2020-07-15
lain
Merge branch 'tests/apc2s-update_outbox' into 'develop'
blob
|
commitdiff
|
raw
2020-07-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2020-07-14
feld
Merge branch 'feature/1922-media-proxy-whitelist' into...
blob
|
commitdiff
|
raw
2020-07-13
Mark Felder
Merge branch 'develop' into refactor/notification_settings
blob
|
commitdiff
|
raw
|
diff to current
2020-07-13
feld
Merge branch 'features/profile-fields-emojo' into ...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-13
feld
Merge branch 'fix/mediaproxy-cache-settings-types'...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-12
Alexander Strizhakov
MediaProxy whitelist setting now supports hosts with...
blob
|
commitdiff
|
raw
2020-07-10
Mark Felder
Merge branch 'develop' into issue/1790-updated-oban
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
lain
Merge branch 'mix-tasks-improvement' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
lain
Merge branch 'cluster-test-ci' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
Haelwenn
Merge branch 'develop' into 'admin-api-user-credentials...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
Haelwenn
Merge branch 'user-search-nickname-rank-boost' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
feld
Merge branch 'chore/use-the-alias' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
Mark Felder
Use the Pleroma.Config alias
blob
|
commitdiff
|
raw
|
diff to current
2020-06-30
Mark Felder
Merge branch 'develop' into activation-meta
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
feld
Merge branch 'preload-data' into 'develop'
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-23
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
Haelwenn
Merge branch 'feature/1631-redesign-mrf-configuration...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
lain
Merge branch 'issue/1798' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
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-22
lain
Merge branch 'feature/1854-emoji-pagination' 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-20
lain
Merge branch 'feature/support-bot-field-in-update-crede...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-20
lain
Merge branch 'develop' into '1865-media-only'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-19
feld
Merge branch 'issue/1855' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-17
Mark Felder
Change references from "deleted_urls" to "banned_urls...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-17
Mark Felder
Remove misleading is_ prefix from boolean function
blob
|
commitdiff
|
raw
|
diff to current
2020-06-17
Mark Felder
Merge branch 'develop' into issue/1855
blob
|
commitdiff
|
raw
|
diff to current
2020-06-15
Maksim Pechnikov
Merge branch 'develop' into issue/1855
blob
|
commitdiff
|
raw
|
diff to current
2020-06-14
Maksim Pechnikov
fix invalidates media url's
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-14
lain
Merge branch 'features/openrc-console' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-22
lain
Merge branch 'docs/debian-packages' into 'develop'
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-12
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-11
feld
Merge branch 'fix/signup-without-email' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-11
feld
Merge branch 'relay-list-change' 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-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/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
feld
Merge branch 'exclude-reblogs-from-admin-api-by-default...
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
Mark Felder
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-03-03
Haelwenn
Merge branch 'chore/update-copyrights' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-03
Mark Felder
Update Copyrights
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
lain
Merge branch 'translation/errors-french' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-24
lain
Merge branch 'admin-create-users' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-24
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-13
rinpatch
Merge branch 'length-limit-bio' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-09
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-08
lain
Merge branch 'feature/digest-email' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-02
feld
Merge branch 'fix/mediaproxy-whitelist-base_url' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-02
feld
Fix/mediaproxy whitelist base url
blob
|
commitdiff
|
raw
|
diff to current
2019-07-20
rinpatch
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-07-18
Maxim Filippov
Merge branch 'develop' into feature/admin-api-user...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-16
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
kaniini
Merge branch 'sha512-crypt' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Sachin Joshi
Merge branch 'develop' into match-file-name
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-14
kaniini
Merge branch 'tests/media_proxy' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-14
Maksim
added tests for Web.MediaProxy
blob
|
commitdiff
|
raw
|
diff to current
2019-07-11
Egor Kislitsyn
Merge branch 'develop' into feature/addressable-lists
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Ivan Tashkinov
[#878] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
kaniini
Merge branch 'remove-avatar-header' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Mark Felder
Merge branch 'develop' into feature/allow-user-query...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
kaniini
Merge branch 'remove-swift' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
kaniini
Merge branch 'features/sec-websocket-protocol-header...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Haelwenn
Merge branch 'enable-ogp-by-default' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
feld
Merge branch 'proxy-error' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Mark Felder
Merge branch 'develop' into proxy-error
blob
|
commitdiff
|
raw
|
diff to current
2019-07-07
Sachin Joshi
make sure the url used by proxy is same as origin url
blob
|
commitdiff
|
raw
|
diff to current
2019-06-23
Sachin Joshi
Merge branch 'develop' into 'remove-avatar-header'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
Mark Felder
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
Mark Felder
Merge branch 'develop' into update-oauth-template
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
lambda
Merge branch 'align-mastodon-conversations' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-02
kaniini
Merge branch 'feature/notification-control-part-2'...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
rinpatch
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
next