Commit History

Autor SHA1 Mensaxe Data
  Andrew Morgan 802884d4ee Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_rooms_federate_develop %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan b8e6ed36c1 Add changelog %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan 6fcb25202f Put function def back to the way it was %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan 7a4632af9c Prevent showing non-fed rooms in fed /publicRooms %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan c0b6955e3b Merge pull request #4745 from matrix-org/revert-4736-anoa/public_rooms_federate %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan c74624a633 Revert "Prevent showing non-fed rooms in fed /publicRooms" %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan a1a6473293 Merge pull request #4736 from matrix-org/anoa/public_rooms_federate %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan c4414768af Cleaner chunk logic %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan a712aa3a9c Correct indent %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan 16565e67db Correct docstring types and chunk logic %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan 40c2271680 Clean up room chunk logic %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan 6728bf3940 Make not showing non-federated rooms the default %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan 6946c20111 Result may be None %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan 71669a0fba Address rich comments %!s(int64=5) %!d(string=hai) anos
  Erik Johnston 899a119c2b Don't log stack trace when client has gone away during media download (#4738) %!s(int64=5) %!d(string=hai) anos
  Richard van der Hoff 641c409e4e Fix ACME config for python 2. (#4717) %!s(int64=5) %!d(string=hai) anos
  Matthew Hodgson 70ea2f4e1d switch from google.com to recaptcha.net for reCAPTCHA (#4731) %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan 96c408273e Fix group's call to generate_room_entry %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan 1330aa4a8f elif not else if %!s(int64=5) %!d(string=hai) anos
  Erik Johnston 65f3fbfbf7 Merge pull request #4737 from matrix-org/erikj/failure_log_tb %!s(int64=5) %!d(string=hai) anos
  Erik Johnston 1d0f2ec812 Newsfile %!s(int64=5) %!d(string=hai) anos
  Erik Johnston c7b333c545 Log tracebacks correctly %!s(int64=5) %!d(string=hai) anos
  Erik Johnston 69efe6fb16 Merge pull request #4718 from matrix-org/erikj/fix_backfill_state_shred %!s(int64=5) %!d(string=hai) anos
  Erik Johnston 108d5fb20d Fixup changelog %!s(int64=5) %!d(string=hai) anos
  Erik Johnston 9c598dddcb Fix typo %!s(int64=5) %!d(string=hai) anos
  Erik Johnston b1a90da82e Merge pull request #4721 from matrix-org/erikj/msc_1866 %!s(int64=5) %!d(string=hai) anos
  Erik Johnston 16c7afa94c Merge pull request #4722 from matrix-org/erikj/correctly_handle_keyring_exceptions %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan 8aaf7ffc44 syntax derp %!s(int64=5) %!d(string=hai) anos
  Andrew Morgan 84c0a20dfe Simplify call to generate_room_entry %!s(int64=5) %!d(string=hai) anos
  Erik Johnston 4b9e5076c4 Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_rooms_federate %!s(int64=5) %!d(string=hai) anos