Commit Graph

12397 Commits (81d4f51524a735cbcafd6c9daeca2178f8145cf9)
 

Author SHA1 Message Date
Richard van der Hoff 81d4f51524 Merge branch 'rav/fix_email_templates_4065' into develop 6 years ago
Richard van der Hoff 593389a077 Remove notes on fallback for email_templates 6 years ago
Richard van der Hoff f62c597d14
Merge pull request #4069 from matrix-org/rav/fix_email_templates_4065 6 years ago
Richard van der Hoff cc325c7069 Calculate absolute path for email templates 6 years ago
Amber Brown e404ba9aac
Fix manhole on py3 (pt 2) (#4067) 6 years ago
Amber Brown b69216f768
Make the metrics less racy (#4061) 6 years ago
Richard van der Hoff 6a4d01ee94
Merge pull request #4060 from matrix-org/hawkowl/ssh-key-py3 6 years ago
Amber Brown 1d17fc52ae changelog 6 years ago
Amber Brown a36b0ec195 make a bytestring 6 years ago
Amber Brown 6190abe8da
Merge pull request #4057 from matrix-org/rav/use_correct_python 6 years ago
Richard van der Hoff c69026a758 Use the right python when starting workers 6 years ago
Richard van der Hoff 2baebace6a Merge branch 'master' into develop 6 years ago
Richard van der Hoff c00f4d237b Add warnings about the upgrade to 0.33.7 6 years ago
Richard van der Hoff 03287c350e remove redundant changelog file 6 years ago
Richard van der Hoff c632bc8654 Merge branch 'master' into develop 6 years ago
Richard van der Hoff 926da4dda8 0.33.7 6 years ago
Erik Johnston e77f24d80a
Merge pull request #4049 from matrix-org/erikj/synctl_colour 6 years ago
Richard van der Hoff 8c2b8d7f0b fix changelog formatting 6 years ago
Richard van der Hoff c7d0f34a3c v0.33.7rc2 6 years ago
Richard van der Hoff 52e3d3813b prep changelog 6 years ago
Richard van der Hoff 0fd2321629 Fix incorrect truncation in get_missing_events 6 years ago
Richard van der Hoff f1bfe6167a
Merge pull request #4052 from matrix-org/rav/ship_resources_as_package_data 6 years ago
Erik Johnston 4e726783ea
Merge pull request #4050 from matrix-org/erikj/fix_py37_iteration 6 years ago
Erik Johnston a5aea15a6b Assume isatty is always defined, and catch AttributeError. Also don't bother checking colour==Normal 6 years ago
Richard van der Hoff c8f2c19991 Put the warning blob at the top of the file 6 years ago
Richard van der Hoff 1519572961 Ship the email templates as package_data 6 years ago
Erik Johnston 3a5d8d5891 Newsfile 6 years ago
Erik Johnston f6a0a02a62 Fix bug where we raised StopIteration in a generator 6 years ago
Erik Johnston 1af16acd4c Newsfile 6 years ago
Erik Johnston df33c164de Only colourise synctl output when attached to tty 6 years ago
Will Hunt d6a7797dd1 Fix roomlist since tokens on Python 3 (#4046) 6 years ago
Richard van der Hoff 6ec9d8ba0a
Merge pull request #4045 from matrix-org/rav/fix_get_missing_events 6 years ago
Amber Brown 80736fd8ed
Merge pull request #4041 from matrix-org/rav/run_tests_in_docker 6 years ago
Richard van der Hoff fc0f13dd03 Fix incorrect truncation in get_missing_events 6 years ago
Richard van der Hoff 10405153c2 Use wget rather than curl 6 years ago
Richard van der Hoff 017eb9d17a changelog 6 years ago
Richard van der Hoff a94967bc5f run the circle builds in docker containers 6 years ago
Richard van der Hoff b8a5b0097c
Various cleanups in the federation client code (#4031) 6 years ago
Amber Brown 24bc15eab4 update changelog 6 years ago
Amber Brown 4e50fe3edb update changelog 6 years ago
Amber Brown f726f2dc6c version bump 6 years ago
David Baker 03c11032c3
Merge pull request #4019 from matrix-org/dbkr/e2e_backups 6 years ago
Amber Brown f9ce1b4eb0
Merge pull request #4033 from intelfx/py37-hotfixes 6 years ago
Ivan Shapovalov 06bc8d2fe5 synapse/app: frontend_proxy.py: actually make workers work on py3 6 years ago
Ivan Shapovalov fb216a22db synapse/visibility.py: fix SyntaxError on py3.7 6 years ago
David Baker a45f2c3a00 missed one 6 years ago
Amber Brown 381d2cfdf0
Make workers work on Py3 (#4027) 6 years ago
David Baker 8c0ff0287a Linting soothes the savage PEP8 monster 6 years ago
David Baker 306361b31b Misc PR feedback bits 6 years ago
David Baker bddfad253a Don't mangle exceptions 6 years ago