:Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / installation / pleroma.nginx
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable'
2021-01-19 rinpatchMerge branch 'stable' into mergeback/2.2.2
2020-12-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-29 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-12-23 lainMerge branch 'stable' into mergeback/2.2.1
2020-12-15 lainMerge branch 'support/2255_posix_errors' into 'develop'
2020-11-21 feldMerge branch 'libmagic' into 'develop'
2020-11-21 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-11-21 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-11-19 feldMerge branch 'oban-jobs-to-simple-tasks' into 'develop'
2020-11-18 minibikiniMerge branch 'develop' into 'hide-muted-reactions'
2020-11-18 lainMerge branch 'frontend-admin-api' into 'develop'
2020-11-17 feldMerge branch 'remove/fedsockets' into 'develop'
2020-11-17 rinpatchRemove FedSockets
2020-11-12 rinpatchMerge branch 'release/2.2.0' into 'stable'
2020-11-04 lainMerge branch 'default-mrf' into 'develop'
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-10-29 HaelwennMerge branch 'issue/2069' into 'develop'
2020-10-09 Mark FelderMerge branch 'develop' into feature/gen-magic
2020-10-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-02 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-09-23 Mark FelderMerge branch 'develop' into feature/bulk-confirmation
2020-09-23 Roman ChvanikovMerge develop
2020-09-22 Maksim PechnikovMerge branch 'develop' into issue/1975
2020-09-22 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-09-22 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-09-21 feldMerge branch 'docs/nginx-config-fedsockets' into 'develop'
2020-09-21 Mark FelderUse an upstream for reverse proxy so future modificatio...
2020-09-21 Mark FelderMost proxy settings can be global
2020-09-21 Mark FelderRemove duplicate setting
2020-09-21 Mark FelderAdd FedSockets config
2020-08-28 lainMerge branch 'release/2.1.0' into 'stable'
2020-08-25 lainMerge branch 'stable' of git.pleroma.social:pleroma...
2020-07-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-06-30 Mark FelderMerge branch 'develop' into activation-meta
2020-06-29 Egor KislitsynMerge branch 'develop' into remove-twitter-api
2020-06-25 Mark FelderMerge branch 'develop' into refactor/notification_settings
2020-06-23 Roman ChvanikovMerge develop
2020-06-22 lainMerge branch 'feature/1739-account-endpoints' into...
2020-06-20 lainMerge branch 'bugfix/mix.exs-version-dot-git-less'...
2020-06-19 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-06-17 rinpatchMerge branch 'features/users-raw_bio' into 'develop'
2020-06-15 Maksim PechnikovMerge branch 'develop' into issue/1855
2020-06-15 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-06-13 rinpatchMerge branch '1851-favorites-pagination' into 'develop'
2020-06-12 Mark FelderMerge branch 'develop' into preload-data
2020-06-12 HaelwennMerge branch 'patch-1' into 'develop'
2020-06-12 normandyUpdate pleroma.nginx to support TLSv1.3
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
2020-05-14 lainMerge branch 'features/openrc-console' into 'develop'
2020-04-22 lainMerge branch 'docs/debian-packages' into 'develop'
2020-03-29 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-03-29 HaelwennMerge branch 'feature/funkwhale-audio' into 'develop'
2020-03-29 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-03-19 lainMerge branch 'remake-remodel' into develop
2020-03-16 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-03-16 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-15 rinpatchMerge branch 'release/2.0.1' into 'stable'
2020-03-15 HaelwennMerge branch 'fix/rate-limiter-remoteip-behavior' into...
2020-03-15 rinpatchMerge branch 'fix/cache-control-headers' into 'develop'
2020-03-14 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-14 rinpatchMerge branch 'update/admin-fe-20200312' into 'develop'
2020-03-14 rinpatchMerge branch 'fix/cache-control-headers' into 'develop'
2020-03-13 Mark FelderMerge branch 'develop' into fix/cache-control-headers
2020-03-13 Mark FelderDo not strip Cache-Control headers from media. Trust...
2020-03-08 rinpatchMerge branch 'release/2.0.0' into 'stable'
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-01-28 lainMerge branch 'translation/errors-french' into 'develop'
2019-10-10 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-04 lainMerge branch 'featrue/job-monitor' into 'develop'
2019-10-04 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-10-02 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-09-30 kPheroxMerge remote-tracking branch 'upstream/develop' into...
2019-09-30 Ivan Tashkinov[#1260] Merge remote-tracking branch 'remotes/upstream...
2019-09-30 lainMerge remote-tracking branch 'origin/develop' into...
2019-09-30 kaniiniMerge branch 'features/apc2s-media-upload' into 'develop'
2019-09-29 kaniiniMerge branch 'feature/follow-requests-count' into ...
2019-09-28 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-27 HaelwennMerge branch 'remote-ip' into 'develop'
2019-09-27 minibikiniAdd `remote_ip` plug
2019-09-27 kaniiniMerge branch 'patch-2' into 'develop'
2019-09-13 lainMerge remote-tracking branch 'origin/develop' into...
2019-09-06 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-09-06 rinpatchMerge branch 'so-long-twitterapi' into 'develop'
2019-09-05 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-09-04 Maxim FilippovMerge branch 'develop' into feature/moderation-log...
2019-08-31 Ivan Tashkinov[#1149] Added Oban job for "activity_expiration". Merge...
2019-08-30 feldMerge branch 'iss-930-media' into 'develop'
2019-08-30 kPheroxFix missing changes in pleroma/pleroma!1197
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-07-09 kaniiniMerge branch 'remove-avatar-header' into 'develop'
2019-06-29 kaniiniMerge branch 'feature/merge-mastodon-admin-views-for...
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-28 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-06-28 lainMerge branch 'release/1.0' into 'develop'
2019-06-28 lainMerge branch 'release-docs' into 'develop'
next