projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Fix merge conflicts with upstream
[akkoma]
/
docs
/
installation
/
otp_en.md
2021-06-04
Sean King
Fix merge conflicts with upstream
blob
|
commitdiff
|
raw
2021-06-04
Haelwenn
Merge branch 'tests/openapi-everywhere' into 'develop'
blob
|
commitdiff
|
raw
2021-06-02
feld
Merge branch 'Snow-develop-patch-01683' into 'develop'
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
feld
Merge branch 'cycles-frontend-static' into 'develop'
blob
|
commitdiff
|
raw
2021-06-01
Haelwenn
Merge branch 'features/validators-note' into 'develop'
blob
|
commitdiff
|
raw
2021-05-31
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-31
Haelwenn
Merge branch 'docs/goto-libera' into 'develop'
blob
|
commitdiff
|
raw
2021-05-31
Haelwenn (lanodan...
Changing references of freenode to libera.chat
blob
|
commitdiff
|
raw
2021-05-30
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-19
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-19
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-16
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-16
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-14
Alex Gleason
Merge remote-tracking branch 'upstream/attachment-meta...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-13
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-03
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-29
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-20
feld
Merge branch 'fix/docs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-04-20
Mark Felder
Fix incorrect shell command
blob
|
commitdiff
|
raw
|
diff to current
2021-03-19
rinpatch
Merge branch 'fix/remove_auto_nsfw' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-02
lain
Merge branch 'release/2.3.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-28
lain
Merge branch 'features/reports-enhancements' into ...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-28
lain
Merge branch 'admin-api-versioning' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-28
lain
Merge branch 'bugfix/peertube-mpegURL-object' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-28
lain
Merge branch 'feat/client_app_details' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-27
lain
Merge branch 'frontendstatic-ignore-api-calls' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-26
feld
Merge branch 'fix/2498-expires_in-scheduled-posts'...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-26
feld
Merge branch 'ecto-rollback-in-test-env' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-26
rinpatch
Merge branch 'PestToast-develop-patch-66930' into ...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-26
PestToast
Removed a command that references "pleroma.env". This...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-26
lain
Merge branch 'develop' into '2435-list-multiple-users'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Mark Felder
Merge branch 'develop' into refactor/deactivated_user_field
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
lain
Merge branch 'test-cases-mox-setup' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-20
feld
Merge branch 'copyright-fun' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-20
feld
Merge branch 'deprecate-public_endpoint' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-20
feld
Merge branch 'update/oban' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-19
lain
Merge branch 'feat/improved-postgres-tuning-docs' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-19
rinpatch
Improve PostgreSQL optimization article
blob
|
commitdiff
|
raw
|
diff to current
2021-01-19
rinpatch
Merge branch 'stable' into mergeback/2.2.2
blob
|
commitdiff
|
raw
|
diff to current
2020-12-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-23
lain
Merge branch 'stable' into mergeback/2.2.1
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
feld
Merge branch 'libmagic' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-17
lain
Merge branch 'chores/note-handling-move' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-17
rinpatch
Import stable commits into develop after releasing...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-15
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-13
lain
Merge branch 'fixes_2034_reports_should_send_a_notifica...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-13
lain
Merge branch 'docs/otp-tuning' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-12
rinpatch
Merge branch 'release/2.2.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-11
Egor Kislitsyn
Merge branch 'develop' into frontend-admin-api
blob
|
commitdiff
|
raw
|
diff to current
2020-11-10
lain
Merge branch '2260-wrong-report-link' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-10
lain
Merge branch 'fix/html-title-load' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-09
Haelwenn
Merge branch 'remove/release-env' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-08
rinpatch
Remove release_env
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'default-mrf' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'ejabberd-pleroma-auth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-03
lain
Merge branch 'chores/pleroma-favicon-logo' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-02
lain
Merge branch 'bugfix/poll_replies_count' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-29
Haelwenn
Merge branch 'issue/2069' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-29
feld
Merge branch 'fix/frontend-cli-docs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-29
feld
Merge branch 'issue/2137-user-filters-admin-fe' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-29
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-28
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-27
minibikini
Merge branch 'develop' into 'feature/local-only-scope'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-27
Mark Felder
Merge branch 'develop' into feature/account-export
blob
|
commitdiff
|
raw
|
diff to current
2020-10-27
feld
Merge branch '1668-prometheus-access-restrictions'...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-27
feld
Merge branch 'develop' into 'feature/autofollowing'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-26
lain
Merge branch 'docs/clients-apc2s' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-26
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-26
rinpatch
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-26
Haelwenn
Merge branch 'docs/ap_c2s' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-25
Kana
Fix link reference
blob
|
commitdiff
|
raw
|
diff to current
2020-10-20
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-19
Egor Kislitsyn
Merge branch 'develop' into mutes-blocks-pagination
blob
|
commitdiff
|
raw
|
diff to current
2020-10-19
Egor Kislitsyn
Merge branch 'develop' into feature/local-only-scope
blob
|
commitdiff
|
raw
|
diff to current
2020-10-19
Haelwenn
Merge branch '2239-mute-fixes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-15
Mark Felder
Merge branch 'develop' into refactor/discoverable_user_...
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history