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]
/
config
/
config.exs
2020-02-09
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2020-02-07
Haelwenn
Merge branch 'cancel-follow-request' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-06
rinpatch
Merge branch 'update/fe-bundle-20200206' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-06
feld
Merge branch 'mastoapi-non-html-strings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-06
rinpatch
Merge branch 'develop' into fix/dymamic-docs
blob
|
commitdiff
|
raw
|
diff to current
2020-02-05
rinpatch
Merge branch 'fix/unpinnable-polls' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-05
rinpatch
Merge branch 'removing-admin-api-endpoint' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-05
feld
Merge branch 'remove-linker-scheme-option' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-05
Egor Kislitsyn
Remove AutoLinker `scheme` option from the config
blob
|
commitdiff
|
raw
|
diff to current
2020-02-05
rinpatch
Merge branch 'feature/restart-pleroma-from-outside...
blob
|
commitdiff
|
raw
|
diff to current
2020-02-04
lain
Merge branch 'feature/make_attachments_cleanup_optional...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-30
Roman Chvanikov
Make attachments cleanup optional
blob
|
commitdiff
|
raw
|
diff to current
2020-01-30
rinpatch
Merge branch 'fix/disable-rate-limiter-for-socket-local...
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-30
lain
Merge branch 'reenable-rate-limit-and-remote-ip' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-29
rinpatch
config.exs: Re-enable rate limiter and enable remote ip
blob
|
commitdiff
|
raw
|
diff to current
2020-01-29
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
feld
Merge branch 'fix/attachments-cleanup' into 'develop'
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-28
lain
Merge branch 'fix/attachments-cleanup' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-27
Maksim Pechnikov
Merge branch 'develop' into feature/tag_feed
blob
|
commitdiff
|
raw
|
diff to current
2020-01-27
Haelwenn
Merge branch 'remove/suggestions-third-party-engine...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-27
Hakaba Hitoyo
Remove user recommendation by third party engine
blob
|
commitdiff
|
raw
|
diff to current
2020-01-26
Mark Felder
Merge branch 'develop' into issue/1280
blob
|
commitdiff
|
raw
|
diff to current
2020-01-23
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-23
Maksim Pechnikov
Merge branch 'develop' into feature/tag_feed
blob
|
commitdiff
|
raw
|
diff to current
2020-01-23
Haelwenn
Merge branch 'emoji-notifications' into 'develop'
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-22
feld
Merge branch 'admin-be' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-22
rinpatch
Merge branch 'emoji-reaction-extensions-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-22
Alexander Strizhakov
Merge branch 'develop' into admin-be
blob
|
commitdiff
|
raw
|
diff to current
2020-01-21
feld
Merge branch 'fix/attachments-cleanup' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-21
Roman Chvanikov
Merge branch 'fix/attachments-cleanup' of git.pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-21
Roman Chvanikov
Add delete_attachments queue to config
blob
|
commitdiff
|
raw
|
diff to current
2020-01-21
Roman Chvanikov
Merge branch 'develop' into fix/attachments-cleanup
blob
|
commitdiff
|
raw
|
diff to current
2020-01-21
Alexander Strizhakov
Merge branch 'develop' into admin-be
blob
|
commitdiff
|
raw
|
diff to current
2020-01-20
Mark Felder
Merge branch 'develop' into fix/attachments-cleanup
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-20
Haelwenn
Merge branch 'hashtag-benchmarks' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-18
Alexander Strizhakov
full update for some subkeys
blob
|
commitdiff
|
raw
|
diff to current
2020-01-16
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-16
sadposter
branch
blob
|
commitdiff
|
raw
|
diff to current
2020-01-15
Maksim Pechnikov
Merge branch 'develop' into feature/tag_feed
blob
|
commitdiff
|
raw
|
diff to current
2020-01-15
lain
Merge branch '1478-oauth-admin-scopes-tweaks' into...
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-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-12
feld
Merge branch 'updated-at-on-conversation-read' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-12
feld
Merge branch 'config/benchmark' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-12
Mark Felder
Merge branch 'develop' into issue/1354
blob
|
commitdiff
|
raw
|
diff to current
2020-01-12
feld
Merge branch 'issue/1487' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-11
rinpatch
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-11
rinpatch
Merge branch 'remove/remove-mdii-uploader' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-11
Hakaba Hitoyo
Remove MDII uploader
blob
|
commitdiff
|
raw
|
diff to current
2020-01-11
Alexander Strizhakov
Merge branch 'develop' into admin-be
blob
|
commitdiff
|
raw
|
diff to current
2020-01-10
Alexander Strizhakov
dynamic_configuration renaming
blob
|
commitdiff
|
raw
|
diff to current
2020-01-10
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-10
lain
Merge branch 'issue/1490' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-10
lain
Merge branch 'oauth-scopes-tweaks-and-tests' into ...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-10
lain
Merge branch 'fix/captcha-time' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-10
Ivan Tashkinov
[#1478] OAuth admin tweaks: enforced OAuth admin scopes...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-09
Mark Felder
Fix captcha time, which was meant to be 5 minutes
blob
|
commitdiff
|
raw
|
diff to current
2020-01-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-24
Haelwenn
Merge branch 'feat/doc-improvements' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-23
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-23
lain
Merge branch 'increase-captcha-expiry-time' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-23
Egor Kislitsyn
Increase CAPTCHA expiration time to 5 minutes
blob
|
commitdiff
|
raw
|
diff to current
2019-12-21
rinpatch
Merge branch 'feature/custom-runtime-modules' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-19
Mark Felder
Merge branch 'develop' into config/benchmark
blob
|
commitdiff
|
raw
|
diff to current
2019-12-19
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-17
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-17
Maxim Filippov
Merge branch 'develop' into fix/disable-rate-limiter...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-17
Maksim Pechnikov
Merge branch 'develop' into feature/tag_feed
blob
|
commitdiff
|
raw
|
diff to current
2019-12-16
lain
Merge branch 'fix/remove-useless-sleep' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-16
Egor Kislitsyn
Merge branch 'develop' into feature/custom-runtime...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-16
rinpatch
Merge branch 'kocaptcha-default-endpoint' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-16
Egor Kislitsyn
Add Kocaptcha endpoint to config.exs
blob
|
commitdiff
|
raw
|
diff to current
2019-12-15
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-12
Egor Kislitsyn
Merge branch 'develop' into feature/custom-runtime...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-12
lain
Merge branch 'feature/native-captcha' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-12
Egor Kislitsyn
Add native captcha and enable it by default.
blob
|
commitdiff
|
raw
|
diff to current
2019-12-11
Maxim Filippov
Merge branch 'develop' into feature/report-notes
blob
|
commitdiff
|
raw
|
diff to current
2019-12-11
Mark Felder
Merge branch 'develop' into issue/1411
blob
|
commitdiff
|
raw
|
diff to current
2019-12-11
rinpatch
Merge branch 'chore/fast_sanitize_bump' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-11
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-10
feld
Merge branch 'fix/unsubscribe-route' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-10
Sadposter
Merge branch 'develop' into 'domain-block-precedence'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-10
lain
Merge branch '1427-oauth-admin-scopes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-10
minibikini
Merge branch 'develop' into 'feature/custom-runtime...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-10
lain
Merge branch 'develop' into '1427-oauth-admin-scopes'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-10
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-09
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-09
Egor Kislitsyn
Merge branch 'develop' into feature/custom-runtime...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-09
lain
Merge branch 'exclude-visibilities-for-like-notificatio...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-09
lain
Merge branch 'fix/user-list-task' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-08
Maksim Pechnikov
Merge branch 'develop' into issue/1342
blob
|
commitdiff
|
raw
|
diff to current
2019-12-08
rinpatch
Merge branch 'fix/clause-never-matches' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next