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
/
netbsd_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
|
diff to current
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
feld
Merge branch 'simplepolicy-announce-leak' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
feld
Merge branch 'gitignore-runtime-exs' into 'develop'
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-18
feld
Merge branch 'blurhash' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-05-17
lain
Merge branch 'optional-config' into 'develop'
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
Docs: use `MIX_ENV=prod mix pleroma.instance gen`
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-03-02
lain
Merge branch 'release/2.3.0' into 'stable'
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-01-19
rinpatch
Merge branch 'stable' into mergeback/2.2.2
blob
|
commitdiff
|
raw
|
diff to current
2021-01-13
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-12
feld
Merge branch 'fix/backup-url-on-s3' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-10
rinpatch
Merge branch 'add_some_information_about_setting_up_a_d...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-10
Ilja
Add development section
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
feld
Merge branch 'libmagic' 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-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-10-29
Haelwenn
Merge branch 'issue/2069' 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-09
Mark Felder
Merge branch 'develop' into feature/gen-magic
blob
|
commitdiff
|
raw
|
diff to current
2020-10-08
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-08
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-06
Mark Felder
Merge branch 'develop' into revert/rich-media-censorship
blob
|
commitdiff
|
raw
|
diff to current
2020-10-06
rinpatch
Merge branch 'filtering-following' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-06
rinpatch
Merge branch 'feature/update-description-for-frontends...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-05
Mark Felder
Merge branch 'develop' into feature/1893-remote-emoji...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-03
rinpatch
Merge branch 'fix/empty-params-openapi' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-29
lain
Merge branch 'ffmpeg-imagemagick-dependencies-documenta...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-26
Ivan Tashkinov
Adjusted MediaProxyControllerTest to gracefully fail...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-24
Ivan Tashkinov
Added documentation on installation of `ffmpeg` and...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-10
Mark Felder
Merge branch 'develop' into feature/gen-magic
blob
|
commitdiff
|
raw
|
diff to current
2020-08-28
lain
Merge branch 'release/2.1.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-25
Haelwenn
Merge branch 'buildx-multiarch-arm32v7' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-25
lain
Merge branch 'stable' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-25
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-12
feld
Merge branch 'docs_improve_static_dir_documentation...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-12
feld
Merge branch 'feature/update-welcome-setting-in-descrip...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-11
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-11
lain
Merge branch '204-fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-11
lain
Merge branch 'fix/activity-expirations-again' of git...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-10
feld
Merge branch 'admin-active-filter' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-10
Mark Felder
Merge branch 'develop' into fix/activity-expirations...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-10
lain
Merge branch 'revert-a6d3bb5f' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-10
lain
Merge branch 'remove-unreachable-code' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-10
lain
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-10
Alibek Omarov
docs: add cmake to other installation guides
blob
|
commitdiff
|
raw
|
diff to current
2020-07-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-30
Mark Felder
Merge branch 'develop' into activation-meta
blob
|
commitdiff
|
raw
|
diff to current
2020-06-29
Egor Kislitsyn
Merge branch 'develop' into remove-twitter-api
blob
|
commitdiff
|
raw
|
diff to current
2020-06-25
feld
Merge branch 'preload-data' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-25
Mark Felder
Merge branch 'develop' into refactor/notification_settings
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
Haelwenn
Merge branch 'feature/1631-redesign-mrf-configuration...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
lain
Merge branch 'issue/1798' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
lain
Merge branch 'fix_1586_provide_index_md' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
Haelwenn
Merge branch 'warning/mastofe-settings-blob' into ...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
lain
Merge branch 'add-muted-to-notifications' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
lain
Merge branch 'feature/1739-account-endpoints' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
lain
Merge branch 'docs_use_include_for_install_further_read...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
Ilja
Add include for the "Further reading" section
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
lain
Merge branch 'translation/errors-french' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-11-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-05
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-04
Maxim Filippov
Merge branch 'develop' into feature/reports-groups...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-21
Maksim Pechnikov
Merge branch 'develop' into feature/masto_api_markers
blob
|
commitdiff
|
raw
|
diff to current
2019-10-21
Egor Kislitsyn
Merge branch 'develop' into refactor/following-relation...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-20
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-19
rinpatch
Merge branch 'mix-emoji-task-pack-json' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
rinpatch
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
Maxim Filippov
Merge branch 'develop' into feature/relay-list
blob
|
commitdiff
|
raw
|
diff to current
2019-10-16
lain
Merge branch 'benchmark-finishing' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-15
Maxim Filippov
DELETE /api/pleroma/admin/users now accepts nicknames...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-14
feld
Merge branch 'exclude-visibilities-for-timelines' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-14
rinpatch
Merge branch 'backport/1.1-branch-name-change' into...
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history