projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merge branch 'openapi/pleroma-api/mascot' into 'develop'
[akkoma]
/
lib
/
pleroma
/
uploaders
/
uploader.ex
2020-05-18
lain
Merge branch 'docs/storing-remote-media' into 'develop'
blob
|
commitdiff
|
raw
2020-05-14
lain
Merge branch 'features/openrc-console' into 'develop'
blob
|
commitdiff
|
raw
2020-03-19
lain
Merge branch 'remake-remodel' into develop
blob
|
commitdiff
|
raw
2020-03-13
rinpatch
Merge branch 'feature/mastofe-admin-scope' into 'develop'
blob
|
commitdiff
|
raw
2020-03-13
rinpatch
Merge branch 'docs/direct_conversation_id' into 'develop'
blob
|
commitdiff
|
raw
2020-03-13
rinpatch
Merge branch 'static-accept-missing' into 'develop'
blob
|
commitdiff
|
raw
2020-03-09
lain
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
2020-03-08
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
2020-03-08
rinpatch
Merge branch 'release/2.0.0' into 'stable'
blob
|
commitdiff
|
raw
2020-03-07
rinpatch
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
blob
|
commitdiff
|
raw
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
2020-03-04
lain
Merge branch 'fix/no-email-no-fail' into 'develop'
blob
|
commitdiff
|
raw
2020-03-03
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
2020-03-02
lain
Merge branch 'prepared-statements-settings' into 'develop'
blob
|
commitdiff
|
raw
2020-03-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2020-03-02
Egor Kislitsyn
Merge branch 'develop' into fix/signup-without-email
blob
|
commitdiff
|
raw
2020-03-02
Haelwenn
Merge branch 'feature/1482-activity_pub_transactions...
blob
|
commitdiff
|
raw
2020-03-02
Haelwenn
Merge branch 'chores/bump-copyright' into 'develop'
blob
|
commitdiff
|
raw
2020-03-02
Haelwenn (lanodan...
Bump copyright years of files changed after 2020-01-07
blob
|
commitdiff
|
raw
2020-02-20
lain
Merge branch 'require-signature' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-30
rinpatch
Merge branch 'develop' into fix/disable-rate-limiter...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
lain
Merge branch 'translation/errors-french' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-27
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2020-01-22
rinpatch
Merge branch 'no-error-404' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-20
lain
Merge branch 'fix-admin-api-scope' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-15
Egor Kislitsyn
Merge branch 'develop' into notifications-from-account
blob
|
commitdiff
|
raw
|
diff to current
2020-01-14
Maksim Pechnikov
Merge branch 'develop' into feature/tag_feed
blob
|
commitdiff
|
raw
|
diff to current
2020-01-14
Alexander Strizhakov
Merge branch 'develop' into admin-be
blob
|
commitdiff
|
raw
|
diff to current
2020-01-13
lain
Merge branch 'feature/ci-registry' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-13
Maksim Pechnikov
Merge branch 'develop' into issue/1383
blob
|
commitdiff
|
raw
|
diff to current
2020-01-12
feld
Merge branch 'feature/attachments-cleanup' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-12
Roman Chvanikov
Delete attachments when status is deleted
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-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-11
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
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-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][CI] Add readability as it’s fixed
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-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
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-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
Uploads fun, part. 2
blob
|
commitdiff
|
raw
|
diff to current
2018-11-30
href
reverse proxy / uploads
blob
|
commitdiff
|
raw
|
diff to current
2018-09-07
kaniini
Merge branch 'add-secure-and-samesite-cookie-flags...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-07
kaniini
Merge branch 'improve-server-config-examples' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-03
kaniini
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-02
kaniini
Merge branch 'hotfix_broken_likes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-31
kaniini
Merge branch 'feature/rich-text' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-30
kaniini
Merge branch 'use-media-proxy-in-suggestions-api' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-30
kaniini
Merge branch 'backendhack' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-30
Thurloat
increase uploader behaviour documentation accuracy.
blob
|
commitdiff
|
raw
|
diff to current
2018-08-30
Thurloat
Add backend failure handling with :ok | :error so the...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-28
Thurloat
add the behaviour, work on actually making it work.
blob
|
commitdiff
|
raw
|
diff to current