Commit History

Author SHA1 Message Date
  Richard van der Hoff 4f8baab0c4 Merge branch 'master' into develop 5 years ago
  Richard van der Hoff c127c8d042 Fix origin handling for pushed transactions 5 years ago
  Amber Brown 77055dba92 Fix tests on postgresql (#3740) 5 years ago
  Neil Johnson 0b01281e77 move threepid checker to config, add missing yields 5 years ago
  Amber Brown 14e4d4f4bf Port storage/ to Python 3 (#3725) 5 years ago
  Richard van der Hoff 414fa36f3e Fix up tests 5 years ago
  Erik Johnston 05077e06fa Change admin_uri to admin_contact in config and errors 5 years ago
  Erik Johnston 4d664278af Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_state_handler 5 years ago
  Amber Brown c334ca67bb Integrate presence from hotfixes (#3694) 5 years ago
  Neil Johnson 13ad9930c8 add new error type ResourceLimit 5 years ago
  Neil Johnson ab035bdeac replace admin_email with admin_uri for greater flexibility 5 years ago
  Neil Johnson f4b49152e2 support admin_email config and pass through into blocking errors, return AuthError in all cases 5 years ago
  Neil Johnson ce7de9ae6b Revert "support admin_email config and pass through into blocking errors, return AuthError in all cases" 5 years ago
  Neil Johnson 0d43f991a1 support admin_email config and pass through into blocking errors, return AuthError in all cases 5 years ago
  Amber Brown 99dd975dae Run tests under PostgreSQL (#3423) 5 years ago
  black 8b3d9b6b19 Run black. 5 years ago
  Richard van der Hoff 3c0213a217 Merge pull request #3439 from vojeroen/send_sni_for_federation_requests 5 years ago
  Erik Johnston 3e19beb941 Fix tests 6 years ago
  Neil Johnson 0ad98e38d0 Merge pull request #3655 from matrix-org/neilj/disable_hs 6 years ago
  Amber Brown 2511f3f8a0 Test fixes for Python 3 (#3647) 6 years ago
  Neil Johnson 5298d79fb5 Merge branch 'develop' into neilj/disable_hs 6 years ago
  Richard van der Hoff 8521ae13e3 Merge pull request #3654 from matrix-org/rav/room_versions 6 years ago
  Neil Johnson d2f3ef98ac Merge branch 'develop' into neilj/disable_hs 6 years ago
  Neil Johnson 7f3d897e7a mock config.max_mau_value 6 years ago
  Neil Johnson fbe255f9a4 add default mau_limits_reserved_threepids 6 years ago
  Neil Johnson 42c6823827 disable HS from config 6 years ago
  Richard van der Hoff 0ca459ea33 Basic support for room versioning 6 years ago
  Neil Johnson 5593ff6773 fix (lots of) py3 test failures 6 years ago
  Amber Brown da7785147d Python 3: Convert some unicode/bytes uses (#3569) 6 years ago
  Richard van der Hoff 7041cd872b Merge branch 'develop' into send_sni_for_federation_requests 6 years ago