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]
/
installation
/
pleroma.nginx
2021-03-02
lain
Merge branch 'release/2.3.0' into 'stable'
blob
|
commitdiff
|
raw
2021-01-19
rinpatch
Merge branch 'stable' into mergeback/2.2.2
blob
|
commitdiff
|
raw
2020-12-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2020-12-29
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2020-12-23
lain
Merge branch 'stable' into mergeback/2.2.1
blob
|
commitdiff
|
raw
2020-12-15
lain
Merge branch 'support/2255_posix_errors' into 'develop'
blob
|
commitdiff
|
raw
2020-11-21
feld
Merge branch 'libmagic' into 'develop'
blob
|
commitdiff
|
raw
2020-11-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2020-11-21
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2020-11-19
feld
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
blob
|
commitdiff
|
raw
2020-11-18
minibikini
Merge branch 'develop' into 'hide-muted-reactions'
blob
|
commitdiff
|
raw
2020-11-18
lain
Merge branch 'frontend-admin-api' into 'develop'
blob
|
commitdiff
|
raw
2020-11-17
feld
Merge branch 'remove/fedsockets' into 'develop'
blob
|
commitdiff
|
raw
2020-11-17
rinpatch
Remove FedSockets
blob
|
commitdiff
|
raw
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-10-29
Haelwenn
Merge branch 'issue/2069' 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-02
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-23
Mark Felder
Merge branch 'develop' into feature/bulk-confirmation
blob
|
commitdiff
|
raw
|
diff to current
2020-09-23
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2020-09-22
Maksim Pechnikov
Merge branch 'develop' into issue/1975
blob
|
commitdiff
|
raw
|
diff to current
2020-09-22
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-22
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-21
feld
Merge branch 'docs/nginx-config-fedsockets' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-21
Mark Felder
Use an upstream for reverse proxy so future modificatio...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-21
Mark Felder
Most proxy settings can be global
blob
|
commitdiff
|
raw
|
diff to current
2020-09-21
Mark Felder
Remove duplicate setting
blob
|
commitdiff
|
raw
|
diff to current
2020-09-21
Mark Felder
Add FedSockets config
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
lain
Merge branch 'stable' of git.pleroma.social:pleroma...
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
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-22
lain
Merge branch 'feature/1739-account-endpoints' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-20
lain
Merge branch 'bugfix/mix.exs-version-dot-git-less'...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-19
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-17
rinpatch
Merge branch 'features/users-raw_bio' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-15
Maksim Pechnikov
Merge branch 'develop' into issue/1855
blob
|
commitdiff
|
raw
|
diff to current
2020-06-15
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-13
rinpatch
Merge branch '1851-favorites-pagination' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-12
Mark Felder
Merge branch 'develop' into preload-data
blob
|
commitdiff
|
raw
|
diff to current
2020-06-12
Haelwenn
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-12
normandy
Update pleroma.nginx to support TLSv1.3
blob
|
commitdiff
|
raw
|
diff to current
2020-05-18
lain
Merge branch 'docs/storing-remote-media' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-14
lain
Merge branch 'features/openrc-console' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-22
lain
Merge branch 'docs/debian-packages' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-29
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-29
Haelwenn
Merge branch 'feature/funkwhale-audio' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-29
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2020-03-19
lain
Merge branch 'remake-remodel' into develop
blob
|
commitdiff
|
raw
|
diff to current
2020-03-16
Egor Kislitsyn
Merge branch 'develop' into global-status-expiration
blob
|
commitdiff
|
raw
|
diff to current
2020-03-16
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-03-15
rinpatch
Merge branch 'release/2.0.1' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-15
Haelwenn
Merge branch 'fix/rate-limiter-remoteip-behavior' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-15
rinpatch
Merge branch 'fix/cache-control-headers' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-14
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-14
rinpatch
Merge branch 'update/admin-fe-20200312' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-14
rinpatch
Merge branch 'fix/cache-control-headers' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
Mark Felder
Merge branch 'develop' into fix/cache-control-headers
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
Mark Felder
Do not strip Cache-Control headers from media. Trust...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-08
rinpatch
Merge branch 'release/2.0.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
|
diff to current
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
lain
Merge branch 'translation/errors-french' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-10
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-04
lain
Merge branch 'featrue/job-monitor' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-04
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-02
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kPherox
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
Ivan Tashkinov
[#1260] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kaniini
Merge branch 'features/apc2s-media-upload' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-29
kaniini
Merge branch 'feature/follow-requests-count' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-28
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
Haelwenn
Merge branch 'remote-ip' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
minibikini
Add `remote_ip` plug
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-13
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-06
Maksim Pechnikov
Merge branch 'develop' into issue/1218
blob
|
commitdiff
|
raw
|
diff to current
2019-09-06
rinpatch
Merge branch 'so-long-twitterapi' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-05
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-04
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-31
Ivan Tashkinov
[#1149] Added Oban job for "activity_expiration". Merge...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-30
feld
Merge branch 'iss-930-media' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-30
kPherox
Fix missing changes in pleroma/pleroma!1197
blob
|
commitdiff
|
raw
|
diff to current
2019-08-24
lain
Merge branch 'admin-create-users' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
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-09
kaniini
Merge branch 'remove-avatar-header' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-29
kaniini
Merge branch 'feature/merge-mastodon-admin-views-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-28
Roman Chvanikov
Resolve conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-06-28
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-28
lain
Merge branch 'release/1.0' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-28
lain
Merge branch 'release-docs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history