projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merge remote-tracking branch 'pleroma/develop' into cycles-frontend-static
[akkoma]
/
lib
/
pleroma
/
web
/
uploader_controller.ex
2021-04-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2021-03-02
lain
Merge branch 'release/2.3.0' into 'stable'
blob
|
commitdiff
|
raw
2021-02-26
feld
Merge branch 'ecto-rollback-in-test-env' into 'develop'
blob
|
commitdiff
|
raw
2021-01-20
feld
Merge branch 'deprecate-public_endpoint' into 'develop'
blob
|
commitdiff
|
raw
2021-01-19
rinpatch
Merge branch 'stable' into mergeback/2.2.2
blob
|
commitdiff
|
raw
2021-01-15
Haelwenn
Merge branch 'optimize-command_available' into 'develop'
blob
|
commitdiff
|
raw
2021-01-13
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2021-01-13
Haelwenn
Merge branch 'chores/bump-copyright' into 'develop'
blob
|
commitdiff
|
raw
2021-01-13
Haelwenn (lanodan...
Bump Copyright to 2021
blob
|
commitdiff
|
raw
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
2019-08-24
lain
Merge branch 'admin-create-users' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-20
rinpatch
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-07-19
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-07-19
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-19
kaniini
Merge branch 'feature/richmedia-ttl' into 'develop'
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-18
kaniini
Merge branch 'feature/signed-object-fetches' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-18
kaniini
Merge branch 'tests/uploads' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-18
Maksim
tests for Uploader with webhook
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-12
Roman Chvanikov
merge develop
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-10
kaniini
Merge branch 'localization' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-10
Egor Kislitsyn
Wrap error messages into gettext helpers
blob
|
commitdiff
|
raw
|
diff to current
2019-07-10
kaniini
Merge branch 'release/listener' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-10
kaniini
Merge branch 'fix/license-attribution' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-10
feld
Add license/copyright to all project files
blob
|
commitdiff
|
raw
|
diff to current
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-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
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-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-31
kaniini
Merge branch 'spc-fix-3' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'fix/tusky-dm' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'develop' into 'oembed_provider'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-23
kaniini
Merge branch 's3-namespace' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-23
lain
Merge branch 'develop' into rename/pleroma_activity_con...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-22
Haelwenn
Merge branch 'fix/activity_get_by_id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-22
kaniini
Merge branch 'uploader-controller' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-21
href
Uploader callback controller
blob
|
commitdiff
|
raw
|
diff to current