Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication...
[akkoma] / lib / pleroma / reverse_proxy /
2020-04-22 lainMerge branch 'docs/debian-packages' into 'develop'
2020-04-17 HaelwennMerge branch 'feature/1584-client-captcha-options'...
2020-04-11 rinpatchMerge branch 'following-relationships-optimizations...
2020-04-10 Egor KislitsynMerge branch 'develop' into fix/support-conversations...
2020-04-10 HaelwennMerge branch 'bugfix/apc2s_upload_activity' into 'develop'
2020-04-09 lainMerge branch 'fix/1658-invite-send' into 'develop'
2020-04-09 lainMerge branch 'open-api' into 'develop'
2020-04-07 rinpatchMerge branch 'fix-auto-link-for-profile-fields' into...
2020-04-06 lainMerge branch 'featureflag/emoji_reactions' into 'develop'
2020-04-06 lainMerge branch 'remake-remodel-2' into 'develop'
2020-04-02 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-04-01 feldMerge branch 'update/adminfe-20200331' into 'develop'
2020-04-01 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-01 feldMerge branch 'gun' into 'develop'
2020-03-30 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-29 HaelwennMerge branch 'feature/funkwhale-audio' into 'develop'
2020-03-29 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-03-20 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-19 lainMerge branch 'remake-remodel' into develop
2020-03-18 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-16 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-16 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-15 HaelwennMerge branch 'fix/rate-limiter-remoteip-behavior' into...
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 rinpatchMerge branch 'feature/mastofe-admin-scope' into 'develop'
2020-03-13 rinpatchMerge branch 'docs/direct_conversation_id' into 'develop'
2020-03-13 rinpatchMerge branch 'static-accept-missing' into 'develop'
2020-03-13 Mark FelderMerge branch 'develop' into fix/cache-control-headers
2020-03-13 Mark FelderLint
2020-03-13 Mark FelderUpdate comment to reflect what the code is actually...
2020-03-13 Mark FelderDo not trust remote Cache-Control headers for mediaproxy
2020-03-13 Alexander Strizhakovmore clean up
2020-03-12 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-11 feldMerge branch 'fix/signup-without-email' into 'develop'
2020-03-11 feldMerge branch 'relay-list-change' into 'develop'
2020-03-09 lainMerge branch 'patch-1' into 'develop'
2020-03-09 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-08 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-03-08 rinpatchMerge branch 'release/2.0.0' into 'stable'
2020-03-07 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-07 rinpatchMerge branch 'restart-fix-for-mix-tasks' into 'develop'
2020-03-06 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-04 feldMerge branch 'exclude-reblogs-from-admin-api-by-default...
2020-03-04 lainMerge branch 'fix/no-email-no-fail' into 'develop'
2020-03-03 Mark FelderUpdate Copyrights for gun related files
2020-03-03 Mark FelderMerge branch 'develop' into gun
2020-03-03 HaelwennMerge branch 'chore/update-copyrights' into 'develop'
2020-03-03 Mark FelderUpdate Copyrights
2020-03-03 Alexander Strizhakovremoving unnecessary with
2020-03-03 Alexander StrizhakovApply suggestion to lib/pleroma/reverse_proxy/client...
2020-03-03 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-01 Alexander StrizhakovMerge branch 'develop' into gun
2020-02-29 Alexander StrizhakovMerge branch 'develop' into gun
2020-02-21 Alexander StrizhakovMerge branch 'develop' into gun
2020-02-18 Mark FelderMerge branch 'develop' into gun
2020-02-18 Alexander Strizhakovadding gun adapter
2020-01-28 lainMerge branch 'translation/errors-french' into 'develop'
2019-11-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-11-04 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-10-21 Egor KislitsynMerge branch 'develop' into refactor/following-relation...
2019-10-19 rinpatchMerge branch 'mix-emoji-task-pack-json' into 'develop'
2019-10-18 rinpatchMerge branch 'patch-1' into 'develop'
2019-10-18 Maxim FilippovMerge branch 'develop' into feature/relay-list
2019-10-16 lainMerge branch 'benchmark-finishing' into 'develop'
2019-10-15 Maxim FilippovDELETE /api/pleroma/admin/users now accepts nicknames...
2019-10-13 lainMerge branch 'incoming-id-fixes' into 'develop'
2019-10-12 rinpatchMerge branch 'cherry-pick-930cbd6d' into 'maint/1.1'
2019-10-12 rinpatchMerge branch 'fix/mediaproxy-too-brutal' into 'develop'
2019-10-12 rinpatchMerge branch 'fix/mediaproxy-too-brutal' into 'develop'
2019-10-11 rinpatchMake MediaProxy failure tracking less brutal
2019-10-10 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-06 HaelwennMerge branch 'fix-prameter-name-of-accounts-update...
2019-10-04 kaniiniMerge branch 'backport/hex-flake-id' into 'maint/1.1'
2019-10-04 kaniiniMerge branch 'backport/feature-track-reverse-proxy...
2019-10-04 Sergey SuprunenkoTrack failed proxy urls and don't request them again
2019-10-04 lainMerge branch 'featrue/job-monitor' into 'develop'
2019-10-04 lainMerge branch 'bugfix/notification-nil-actor' into ...
2019-10-02 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-02 kaniiniMerge branch 'feature/send-identifier-on-oauth-error...
2019-10-02 kaniiniMerge branch 'split-masto-api/auth' into 'develop'
2019-10-02 kaniiniMerge branch 'features/private-reblogs' into 'develop'
2019-10-01 feldMerge branch 'feature/track-reverse-proxy-failures...
2019-10-01 Sergey SuprunenkoTrack failed proxy urls and don't request them again
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-08-24 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-22 Ivan Tashkinov[#1149] Merge remote-tracking branch 'remotes/upstream...
2019-08-20 lainMerge branch 'fix/admin-api-user-deletion' into 'develop'
2019-08-20 lainMerge branch 'digest-template' into 'develop'
2019-08-20 lainMerge branch 'feature/custom-fields' into 'develop'
2019-08-19 lainMerge branch 'fix/reverse-proxy-body-too-large' into...
2019-08-19 lainMerge branch 'develop' into 'fix/reverse-proxy-body...
2019-08-16 Mark FelderFormatting
2019-08-15 Mark Feldermax_body_size -> max_body_length, as it should be
2019-07-20 rinpatchResolve merge conflicts
next