projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
upload
/
2019-08-24
lain
Merge branch 'admin-create-users' into 'develop'
tree
|
commitdiff
2019-07-20
rinpatch
Resolve merge conflicts
tree
|
commitdiff
2019-07-20
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-07-19
Roman Chvanikov
Merge develop
tree
|
commitdiff
2019-07-19
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
tree
|
commitdiff
2019-07-19
kaniini
Merge branch 'feature/richmedia-ttl' into 'develop'
tree
|
commitdiff
2019-07-18
Maxim Filippov
Merge branch 'develop' into feature/admin-api-user...
tree
|
commitdiff
2019-07-17
kaniini
Merge branch 'feature/mention-mrf' into 'develop'
tree
|
commitdiff
2019-07-16
kaniini
Merge branch 'tests/upload_filters' into 'develop'
tree
|
commitdiff
2019-07-16
Maksim
added tests for Pleroma.Upload.Filter
tree
|
commitdiff
2019-07-15
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
tree
|
commitdiff
2019-07-11
Egor Kislitsyn
Merge branch 'develop' into feature/addressable-lists
tree
|
commitdiff
2019-07-09
kaniini
Merge branch 'remove-avatar-header' into 'develop'
tree
|
commitdiff
2019-07-06
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-07-01
Haelwenn
Merge branch 'fix/docs-dry-run' into 'develop'
tree
|
commitdiff
2019-07-01
Haelwenn
Merge branch 'ci-improvements' into 'develop'
tree
|
commitdiff
2019-06-30
Roman Chvanikov
Merge branch 'develop' into feature/digest-email
tree
|
commitdiff
2019-06-30
Ivan Tashkinov
[#161] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-06-30
rinpatch
Merge branch 'issues/1026' into 'develop'
tree
|
commitdiff
2019-06-30
Maksim
[#1026] Filter.AnonymizeFilename added ability to retai...
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-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
tree
|
commitdiff
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
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...
Credo fixes: parameter consistency
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/mix-task-uploads-moduledoc' into...
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-07
href
AnonymizeFilename: allow for a pre-defined text instead...
tree
|
commitdiff
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
tree
|
commitdiff
2018-12-03
lambda
Merge branch 'fix-media-proxy-defaults' into 'develop'
tree
|
commitdiff
2018-12-01
rinpatch
Attempt to resolve merge conflict
tree
|
commitdiff
2018-12-01
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2018-12-01
kaniini
Merge branch 'feature/anonymize-filenames' into 'develop'
tree
|
commitdiff
2018-11-30
href
Upload filter: anonymize filename
tree
|
commitdiff
2018-11-30
kaniini
Merge branch 'feature/reverse-proxy' into 'develop'
tree
|
commitdiff
2018-11-30
href
Uploads fun, part. 2
tree
|
commitdiff