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
/
web
/
web.ex
2019-10-10
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2019-09-30
kPherox
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2019-09-27
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
2019-09-27
kaniini
Merge branch 'update/docs-jp' into 'develop'
blob
|
commitdiff
|
raw
2019-09-25
Maksim Pechnikov
Merge branch 'develop' into issue/1218
blob
|
commitdiff
|
raw
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
2019-09-16
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
blob
|
commitdiff
|
raw
2019-09-16
Maxim Filippov
Merge branch 'develop' into feature/return-total-for...
blob
|
commitdiff
|
raw
2019-09-15
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
2019-09-15
Maksim Pechnikov
Merge branch 'develop' into support/tests
blob
|
commitdiff
|
raw
2019-09-14
rinpatch
Merge branch 'fix/truncate-remote-user-fields' into...
blob
|
commitdiff
|
raw
2019-09-14
Ivan Tashkinov
[#1149] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
2019-09-13
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2019-09-13
lain
Merge branch 'refactor/add_link_headers' into 'develop'
blob
|
commitdiff
|
raw
2019-09-13
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2019-09-13
rinpatch
Merge branch 'admin-config-description' into 'develop'
blob
|
commitdiff
|
raw
2019-09-12
Maksim Pechnikov
Merge branch 'develop' into test/activity_pub/transmogr...
blob
|
commitdiff
|
raw
2019-09-11
Haelwenn
Merge branch 'patch-5' into 'develop'
blob
|
commitdiff
|
raw
2019-09-11
lain
Merge branch 'fix/oom-parallel-rendering' into 'develop'
blob
|
commitdiff
|
raw
2019-09-10
rinpatch
Revert "Parallelize template rendering"
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-22
Ivan Tashkinov
[#1149] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-20
lain
Merge branch 'fix/admin-api-user-deletion' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-20
lain
Merge branch 'digest-template' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-20
lain
Merge branch 'feature/custom-fields' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-19
lain
Merge branch 'develop' into 'fix/reverse-proxy-body...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-18
kaniini
Merge branch 'feature/hide-muted-threads-from-timeline...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-16
lain
Merge branch 'pleroma-conversations' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-16
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-15
kaniini
Merge branch 'features/formatting-sub_sup' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-15
lain
Merge branch 'feature/parallel-rendering' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-15
rinpatch
Parallelize template rendering
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
Maxim Filippov
Merge branch 'develop' into 'fix/admin-api-user-deletion'
blob
|
commitdiff
|
raw
2019-08-14
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
2019-08-14
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2019-08-13
rinpatch
Merge branch 'feature/mrf-vocabulary' into 'develop'
blob
|
commitdiff
|
raw
2019-08-13
kaniini
Merge branch 'feature/mrf-describe' into 'develop'
blob
|
commitdiff
|
raw
2019-08-13
rinpatch
Merge branch 'length-limit-bio' into 'develop'
blob
|
commitdiff
|
raw
2019-08-13
Haelwenn
Merge branch 'fix/mastoapi-more-object-preloads' into...
blob
|
commitdiff
|
raw
2019-08-13
kaniini
Merge branch 'feature/nicer-safe-render-errors' into...
blob
|
commitdiff
|
raw
2019-08-13
rinpatch
Nicer formatting for safe_render errors
blob
|
commitdiff
|
raw
2019-07-15
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-14
sadposter
Merge branch 'develop' of https://git.pleroma.social...
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
Add translation 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-03-18
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-04
Karen Konou
Merge branch 'bugfix/delete-activity-audience' of git...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-03
link0ff
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-03
kaniini
Merge branch 'feature/add-pagination-to-users-admin...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-03
lambda
Merge branch 'fix/dont-show-dms-in-mentions-timeline...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-02
rinpatch
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-01
lambda
Merge branch 'bugfix/236-ambiguous-route-for-numerical...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-28
kaniini
Merge branch 'with-mutes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-28
href
Merge branch 'customizable_auth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-28
Ivan Tashkinov
Made auth customization be runtime-configurable.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-26
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-22
Ivan Tashkinov
Minor setting name adjustment (:app_template -> :app_la...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-21
Ivan Tashkinov
Auth customization support.
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...
de-group import/s
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
Haelwenn (lanodan...
Stash
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-31
Egor Kislitsyn
Merge remote-tracking branch 'MAIN/develop' into featur...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-29
kaniini
Merge branch 'hj-happiness-improvement' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
Ivan Tashkinov
[#534] Merged `upstream/develop`.
blob
|
commitdiff
|
raw
|
diff to current
2019-01-27
lambda
Merge branch 'safe-render-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-27
href
Views: wrap activity rendering in a rescue
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-05-06
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-10
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-01
KANEKO Yoshitaka
Fix conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-03-30
lain
Format the code.
blob
|
commitdiff
|
raw
|
diff to current
2017-05-07
Roger Braun
Merge branch 'develop' into dtluna/pleroma-feature...
blob
|
commitdiff
|
raw
|
diff to current
2017-05-05
Roger Braun
Merge branch 'develop' into dtluna/pleroma-refactor/1
blob
|
commitdiff
|
raw
|
diff to current
2017-05-03
Roger Braun
Attachment parsing, better magic key fetching.
blob
|
commitdiff
|
raw
|
diff to current
2017-04-28
dtluna
Merge branch 'develop' of ssh.gitgud.io:lambadalambda...
blob
|
commitdiff
|
raw
|
diff to current
2017-04-27
dtluna
Refactor code to comply with credo suggestions
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history