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.ex
2019-10-27
Maxim Filippov
Merge branch 'develop' into feature/store-statuses...
blob
|
commitdiff
|
raw
2019-10-21
Maksim Pechnikov
Merge branch 'develop' into feature/masto_api_markers
blob
|
commitdiff
|
raw
2019-10-21
Egor Kislitsyn
Merge branch 'develop' into refactor/following-relation...
blob
|
commitdiff
|
raw
2019-10-20
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
2019-10-19
rinpatch
Merge branch 'mix-emoji-task-pack-json' into 'develop'
blob
|
commitdiff
|
raw
2019-10-18
Mark Felder
Merge branch 'develop' into feature/push-subject-for-dm
blob
|
commitdiff
|
raw
2019-10-18
rinpatch
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
2019-10-18
Maxim Filippov
Merge branch 'develop' into feature/relay-list
blob
|
commitdiff
|
raw
2019-10-18
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2019-10-18
rinpatch
Merge branch 'cleanup/deprecated_config_upload' into...
blob
|
commitdiff
|
raw
2019-10-18
Haelwenn (lanodan...
upload.ex: Remove deprecated configuration
blob
|
commitdiff
|
raw
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-02
Roman Chvanikov
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-07-25
rinpatch
Merge branch 'develop' into feature/hide-follows-remote
blob
|
commitdiff
|
raw
|
diff to current
2019-07-25
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
kaniini
Merge branch 'fix-remote-follow-from-ostatus-subscribe...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
kaniini
Merge branch 'fix/Upload_base_url' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
feld
Do not prepend /media/ when using base_url
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-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-13
lambda
Merge branch 'mascot/pleroma-tan-shy' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-13
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-08
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-07
kaniini
Merge branch 'refactor/preload-bookmarks-with-activitie...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-07
kaniini
Merge branch 'docs/MRF-modules' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-06
Haelwenn (lanodan...
Remove H1 in @moduledoc
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Alex S
Merging with develop
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-18
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-16
kaniini
Merge branch 'feature/federated-flags' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-16
lambda
Merge branch 'feature/oauth-me' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-15
kaniini
Merge branch 'feature/openldap-support' into 'develop'
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-15
kaniini
Merge branch 'notifications-is-seen' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-15
kaniini
Merge branch 'robotstxt' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
kaniini
Merge branch 'fix/filename-mangling' into '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
Add some tests
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-12
rinpatch
WIP: Stop mangling filenames
blob
|
commitdiff
|
raw
|
diff to current
2019-03-08
kaniini
Merge branch 'fix-tlsv1.3' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-07
rinpatch
Merge branch 'bugfix/delete-activity-audience' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-06
kaniini
Merge branch 'chore/merge-search-into-list-users' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-06
kaniini
Merge branch 'bugfix/connect-src-https' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-06
kaniini
Merge branch 'bugfix/rel-me_list' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-06
kaniini
Merge branch 'features/masto_fe-config' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-06
Haelwenn
Merge branch 'fix/escape-reserved-chars-in-filenames...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-05
rinpatch
Properly escape reserved URI charachters in upload...
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...
Credo fixes: parameter consistency
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
rinpatch
Merge branch 'fix/activitypub-user-view-badmap' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-05
kaniini
Merge branch 'feature/split-hide-network-v2' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
rinpatch
Merge branch 'hotfix/hellthread-deprecation-warning...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
kaniini
Merge branch 'mime-riff' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
rinpatch
Merge branch 'fix/rich-media-relative-path' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
rinpatch
Merge branch 'feature/hellthread-filter-improvements...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-03
kaniini
Merge branch 'mogrify-orient' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-03
Mark Felder
Update Mogrify docs and warning for deprecated syntax...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-20
lambda
Merge branch 'i1t/pleroma-477_user_search_improvements...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-18
rinpatch
Fix merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-16
lambda
Merge branch '518_instance_stats_fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-15
lambda
Merge branch 'fix/elixir-1-8-type-annotation' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-15
rinpatch
Merge branch 'bugfix/upload_with_question_mark' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-15
Haelwenn (lanodan...
Upload: Fix uploading with a : in the filename
blob
|
commitdiff
|
raw
|
diff to current
2019-01-15
Haelwenn (lanodan...
Upload: Fix uploading with a ? in the filename
blob
|
commitdiff
|
raw
|
diff to current
2019-01-15
Maxim Filippov
Fix Elixir 1.8 type annotation issue
blob
|
commitdiff
|
raw
|
diff to current
2019-01-14
rinpatch
Merge branch 'media-url-escape' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-14
Shadowfacts
URI escape file upload URLs
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-18
lambda
Merge branch 'feature/new-user-routes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch 'feature/file-size-checking' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix_empty_bio_crash' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix/config-md-typos' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'support/bugfix_272' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history