Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix manhole on py3 (pt 2) (#4067) | Amber Brown | 2018-10-19 | 2 | -0/+3 |
* | Make the metrics less racy (#4061) | Amber Brown | 2018-10-19 | 3 | -16/+22 |
* | Merge pull request #4060 from matrix-org/hawkowl/ssh-key-py3 | Richard van der Hoff | 2018-10-19 | 2 | -2/+3 |
|\ | |||||
| * | changelog | Amber Brown | 2018-10-19 | 1 | -0/+1 |
| * | make a bytestring | Amber Brown | 2018-10-19 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #4057 from matrix-org/rav/use_correct_python | Amber Brown | 2018-10-19 | 2 | -1/+3 |
|\ | |||||
| * | Use the right python when starting workers | Richard van der Hoff | 2018-10-18 | 2 | -1/+3 |
|/ | |||||
* | Merge branch 'master' into develop | Richard van der Hoff | 2018-10-18 | 1 | -0/+17 |
|\ | |||||
| * | Add warnings about the upgrade to 0.33.7 github/release-v0.33.7 release-v0.33.7 | Richard van der Hoff | 2018-10-18 | 1 | -0/+17 |
* | | remove redundant changelog file | Richard van der Hoff | 2018-10-18 | 1 | -1/+0 |
* | | Merge branch 'master' into develop | Richard van der Hoff | 2018-10-18 | 24 | -18/+101 |
|\| | |||||
| * | 0.33.7 v0.33.7 | Richard van der Hoff | 2018-10-18 | 2 | -3/+6 |
| * | fix changelog formatting v0.33.7rc2 | Richard van der Hoff | 2018-10-17 | 1 | -1/+4 |
| * | v0.33.7rc2 | Richard van der Hoff | 2018-10-17 | 1 | -1/+1 |
| * | prep changelog | Richard van der Hoff | 2018-10-17 | 3 | -13/+25 |
| * | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-17 | 5 | -35/+26 |
| * | Merge pull request #4052 from matrix-org/rav/ship_resources_as_package_data | Richard van der Hoff | 2018-10-17 | 13 | -6/+53 |
| |\ | |||||
| | * | Put the warning blob at the top of the file | Richard van der Hoff | 2018-10-17 | 1 | -6/+9 |
| | * | Ship the email templates as package_data | Richard van der Hoff | 2018-10-17 | 13 | -6/+50 |
| |/ | |||||
| * | update changelog v0.33.7rc1 | Amber Brown | 2018-10-15 | 11 | -10/+28 |
| * | update changelog | Amber Brown | 2018-10-15 | 1 | -2/+1 |
| * | version bump | Amber Brown | 2018-10-15 | 1 | -1/+1 |
* | | Merge pull request #4049 from matrix-org/erikj/synctl_colour | Erik Johnston | 2018-10-18 | 2 | -1/+11 |
|\ \ | |||||
| * | | Assume isatty is always defined, and catch AttributeError. Also don't bother ... | Erik Johnston | 2018-10-17 | 1 | -2/+6 |
| * | | Newsfile | Erik Johnston | 2018-10-17 | 1 | -0/+1 |
| * | | Only colourise synctl output when attached to tty | Erik Johnston | 2018-10-17 | 1 | -1/+6 |
* | | | Merge pull request #4050 from matrix-org/erikj/fix_py37_iteration | Erik Johnston | 2018-10-17 | 2 | -2/+6 |
|\ \ \ | |/ / |/| | | |||||
| * | | Newsfile | Erik Johnston | 2018-10-17 | 1 | -0/+1 |
| * | | Fix bug where we raised StopIteration in a generator | Erik Johnston | 2018-10-17 | 1 | -2/+5 |
|/ / | |||||
* | | Fix roomlist since tokens on Python 3 (#4046) | Will Hunt | 2018-10-17 | 4 | -3/+50 |
* | | Merge pull request #4045 from matrix-org/rav/fix_get_missing_events | Richard van der Hoff | 2018-10-17 | 5 | -35/+26 |
|\ \ | |||||
| * | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-16 | 5 | -35/+26 |
* | | | Merge pull request #4041 from matrix-org/rav/run_tests_in_docker | Amber Brown | 2018-10-17 | 3 | -43/+51 |
|\ \ \ | |/ / |/| | | |||||
| * | | Use wget rather than curl | Richard van der Hoff | 2018-10-16 | 1 | -2/+2 |
| * | | changelog | Richard van der Hoff | 2018-10-16 | 1 | -0/+1 |
| * | | run the circle builds in docker containers | Richard van der Hoff | 2018-10-16 | 1 | -41/+48 |
|/ / | |||||
* / | Various cleanups in the federation client code (#4031) | Richard van der Hoff | 2018-10-16 | 4 | -61/+64 |
|/ | |||||
* | Merge pull request #4019 from matrix-org/dbkr/e2e_backups | David Baker | 2018-10-15 | 10 | -0/+1442 |
|\ | |||||
| * | missed one | David Baker | 2018-10-12 | 1 | -0/+1 |
| * | Linting soothes the savage PEP8 monster | David Baker | 2018-10-12 | 1 | -4/+9 |
| * | Misc PR feedback bits | David Baker | 2018-10-12 | 1 | -2/+2 |
| * | Don't mangle exceptions | David Baker | 2018-10-12 | 1 | -4/+2 |
| * | Split /room_keys/version into 2 servlets | David Baker | 2018-10-12 | 1 | -9/+21 |
| * | PR feedback pt. 1 | David Baker | 2018-10-12 | 3 | -29/+22 |
| * | Fix mergefail | David Baker | 2018-10-09 | 1 | -1/+1 |
| * | Add changelog | David Baker | 2018-10-09 | 1 | -0/+1 |
| * | isort | David Baker | 2018-10-09 | 1 | -1/+1 |
| * | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 210 | -3221/+5551 |
| |\ | |||||
| * | | Apparently this blank line is Very Important | David Baker | 2018-10-09 | 1 | -0/+1 |
| * | | be python3 compatible | David Baker | 2018-10-09 | 1 | -2/+3 |
| * | | Don't reuse backup versions | David Baker | 2018-10-05 | 2 | -3/+9 |
| * | | WIP e2e key backups | David Baker | 2018-09-13 | 2 | -4/+10 |
| * | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 5 | -8/+15 |
| * | | update to newer Synapse APIs | Hubert Chathi | 2018-08-24 | 2 | -1/+2 |
| * | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 232 | -4107/+7197 |
| |\ \ | |||||
| * | | | allow session_data to be any JSON instead of just a string | Hubert Chathi | 2018-08-21 | 1 | -2/+4 |
| * | | | allow auth_data to be any JSON instead of a string | Hubert Chathi | 2018-08-21 | 1 | -2/+5 |
| * | | | missing import | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| * | | | missing import | Matthew Hodgson | 2018-08-12 | 1 | -0/+1 |
| * | | | use parse_string | Matthew Hodgson | 2018-08-12 | 1 | -3/+3 |
| * | | | 404 nicely if you try to interact with a missing current version | Matthew Hodgson | 2018-08-12 | 2 | -16/+57 |
| * | | | support DELETE /version with no args | Matthew Hodgson | 2018-08-12 | 2 | -3/+4 |
| * | | | flake8 | Matthew Hodgson | 2018-08-12 | 2 | -9/+14 |
| * | | | implement remaining tests and make them work | Matthew Hodgson | 2018-08-12 | 4 | -33/+287 |
| * | | | linting | Matthew Hodgson | 2018-08-12 | 1 | -25/+23 |
| * | | | fix idiocies and so make tests pass | Matthew Hodgson | 2018-08-12 | 3 | -11/+15 |
| * | | | first cut at a UT | Matthew Hodgson | 2018-08-12 | 1 | -0/+141 |
| * | | | don't needlessly return user_id | Matthew Hodgson | 2018-08-12 | 1 | -1/+0 |
| * | | | improve docstring | Matthew Hodgson | 2018-08-12 | 1 | -1/+5 |
| * | | | switch get_current_version_info back to being get_version_info | Matthew Hodgson | 2018-08-12 | 1 | -4/+7 |
| * | | | fix flakes | Matthew Hodgson | 2018-08-12 | 2 | -4/+6 |
| * | | | fix typos | Matthew Hodgson | 2018-08-12 | 2 | -2/+3 |
| * | | | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 2 | -9/+113 |
| * | | | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 1 | -20/+31 |
| * | | | more docstring for the e2e_room_keys rest | Matthew Hodgson | 2018-08-12 | 2 | -2/+51 |
| * | | | add storage docstring; remove unused set_e2e_room_keys | Matthew Hodgson | 2018-08-12 | 1 | -36/+83 |
| * | | | fix factoring out of _should_replace_room_key | Matthew Hodgson | 2018-08-12 | 1 | -3/+4 |
| * | | | rename room_key_version table correctly, and fix opt args | Matthew Hodgson | 2018-08-12 | 2 | -16/+16 |
| * | | | blindly incorporate PR review - needs testing & fixing | Matthew Hodgson | 2018-08-12 | 5 | -79/+99 |
| * | | | make /room_keys/version work | Matthew Hodgson | 2018-08-12 | 4 | -15/+38 |
| * | | | implement /room_keys/version too (untested) | Matthew Hodgson | 2018-08-12 | 5 | -6/+171 |
| * | | | document the API | Matthew Hodgson | 2018-08-12 | 1 | -0/+133 |
| * | | | make it work and fix pep8 | Matthew Hodgson | 2018-08-12 | 7 | -82/+134 |
| * | | | interim WIP checkin; doesn't build yet | Matthew Hodgson | 2018-08-12 | 3 | -19/+84 |
| * | | | total WIP skeleton for /room_keys API | Matthew Hodgson | 2018-08-12 | 4 | -0/+289 |
* | | | | Merge pull request #4033 from intelfx/py37-hotfixes | Amber Brown | 2018-10-15 | 3 | -3/+5 |
|\ \ \ \ | |||||
| * | | | | synapse/app: frontend_proxy.py: actually make workers work on py3 | Ivan Shapovalov | 2018-10-14 | 2 | -2/+3 |
| * | | | | synapse/visibility.py: fix SyntaxError on py3.7 | Ivan Shapovalov | 2018-10-14 | 2 | -1/+2 |
|/ / / / | |||||
* | | | | Make workers work on Py3 (#4027) | Amber Brown | 2018-10-13 | 13 | -62/+64 |
* | | | | Comments on get_all_new_events_stream | Richard van der Hoff | 2018-10-12 | 1 | -1/+15 |
* | | | | Merge pull request #4022 from matrix-org/erikj/metrics_lazy_loaded_count | Erik Johnston | 2018-10-10 | 2 | -8/+33 |
|\ \ \ \ | |||||
| * | | | | Add description to counter metric | Erik Johnston | 2018-10-10 | 1 | -1/+5 |
| * | | | | Update newsfile | Erik Johnston | 2018-10-10 | 1 | -1/+1 |
| * | | | | Track number of non-empty sync responses instead | Erik Johnston | 2018-10-10 | 1 | -9/+15 |
| * | | | | Append _total to metric and fix up spelling | Erik Johnston | 2018-10-10 | 1 | -2/+2 |
| * | | | | Newsfile | Erik Johnston | 2018-10-09 | 1 | -0/+1 |
| * | | | | Add metric to count lazy member sync requests | Erik Johnston | 2018-10-09 | 1 | -6/+20 |
|/ / / / | |||||
* | | | | Merge pull request #4008 from matrix-org/erikj/log_looping_exceptions | Erik Johnston | 2018-10-09 | 3 | -13/+36 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Remove unnecessary extra function call layer | Erik Johnston | 2018-10-08 | 2 | -31/+16 |
| * | | | Use errback pattern and catch async failures | Erik Johnston | 2018-10-08 | 2 | -15/+35 |
| * | | | Newsfile | Erik Johnston | 2018-10-05 | 1 | -0/+1 |
| * | | | Log looping call exceptions | Erik Johnston | 2018-10-05 | 1 | -1/+18 |
* | | | | Merge pull request #4017 from matrix-org/rav/optimise_filter_events_for_server | Richard van der Hoff | 2018-10-09 | 2 | -7/+7 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Optimisation for filter_events_for_server | Richard van der Hoff | 2018-10-08 | 2 | -7/+7 |
|/ / / | |||||
* | | | Merge pull request #3995 from matrix-org/rav/no_deextrem_outliers | Richard van der Hoff | 2018-10-04 | 2 | -33/+70 |
|\ \ \ | |||||
| * | | | actually exclude outliers | Richard van der Hoff | 2018-10-03 | 1 | -1/+2 |
| * | | | fix newsfile name | Richard van der Hoff | 2018-10-03 | 1 | -0/+0 |
| * | | | remove debugging | Richard van der Hoff | 2018-10-02 | 1 | -10/+0 |
| * | | | Fix bug in forward_extremity update logic | Richard van der Hoff | 2018-10-02 | 2 | -33/+79 |
* | | | | Merge branch 'master' into develop | Amber Brown | 2018-10-04 | 63 | -66/+88 |
|\ \ \ \ | |||||
| * | | | | changelog v0.33.6 github/release-v0.33.6 release-v0.33.6 | Amber Brown | 2018-10-04 | 2 | -1/+9 |
| * | | | | full version | Amber Brown | 2018-10-04 | 1 | -1/+1 |
| * | | | | Merge pull request #4002 from matrix-org/rav/pin_prometheus | Richard van der Hoff | 2018-10-03 | 2 | -1/+5 |
| |\ \ \ \ | |||||
| | * | | | | Pin to prometheus_client<0.4 to avoid renaming all of our metrics | Richard van der Hoff | 2018-10-03 | 2 | -1/+5 |
| |/ / / / | |||||
| * | | | | Merge pull request #3998 from matrix-org/michaelkaye/build_docker_images_of_r... | Richard van der Hoff | 2018-10-03 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Docker build all tags starting vX.Y.Z, inc RCs | Michael Kaye | 2018-10-03 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | some changelog fixes | Amber Brown | 2018-10-03 | 1 | -8/+4 |
| * | | | | changelog v0.33.6rc1 | Amber Brown | 2018-10-03 | 60 | -61/+75 |
| * | | | | version | Amber Brown | 2018-10-03 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetion | Erik Johnston | 2018-10-03 | 2 | -5/+3 |
|\ \ \ \ | |||||
| * | | | | Sanitise error messages when user doesn't have permission to invite | Erik Johnston | 2018-10-03 | 1 | -5/+2 |
| * | | | | Newsfile | Erik Johnston | 2018-10-03 | 1 | -0/+1 |
| * | | | | Fix handling of rejected threepid invites | Erik Johnston | 2018-10-03 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #3996 from matrix-org/erikj/fix_bg_iteration | Erik Johnston | 2018-10-03 | 2 | -2/+7 |
|\ \ \ \ | |||||
| * | | | | Newsfile | Erik Johnston | 2018-10-03 | 1 | -0/+1 |
| * | | | | Fix exception in background metrics collection | Erik Johnston | 2018-10-03 | 1 | -2/+6 |
| |/ / / | |||||
* | | | | Merge pull request #3997 from matrix-org/erikj/fix_profile_error_handling | Erik Johnston | 2018-10-03 | 2 | -6/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Newsfile | Erik Johnston | 2018-10-03 | 1 | -0/+1 |
| * | | | Fix exception handling in fetching remote profiles | Erik Johnston | 2018-10-03 | 1 | -6/+2 |
|/ / / | |||||
* | | | Merge pull request #3991 from matrix-org/erikj/fix_pop_retry_cache | Erik Johnston | 2018-10-02 | 3 | -1/+47 |
|\ \ \ | |||||
| * | | | Add tests | Erik Johnston | 2018-10-02 | 1 | -0/+45 |
| * | | | Newsfile | Erik Johnston | 2018-10-02 | 1 | -0/+1 |
| * | | | Fix bug when invalidating destination retry timings | Erik Johnston | 2018-10-02 | 1 | -1/+1 |
* | | | | Remove Jenkins & other old dev junk (#3988) | Amber Brown | 2018-10-03 | 12 | -278/+4 |
|/ / / | |||||
* | | | Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-02 | 2 | -2/+3 |
|\ \ \ | |||||
| * \ \ | Merge branch 'develop' into rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-01 | 68 | -442/+779 |
| |\ \ \ | |||||
| * | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| * | | | | Fix error handling for missing auth_event | Richard van der Hoff | 2018-09-26 | 1 | -2/+2 |
* | | | | | Disable frozen dicts by default (#3987) | Amber Brown | 2018-10-02 | 4 | -5/+18 |
* | | | | | Merge pull request #3990 from matrix-org/erikj/fix_logging_lost_connection | Erik Johnston | 2018-10-02 | 2 | -6/+22 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2018-10-02 | 1 | -0/+1 |
| * | | | | | Fix error when logging incomplete requests | Erik Johnston | 2018-10-02 | 1 | -6/+21 |
|/ / / / / | |||||
* | | | | | Merge pull request #3989 from matrix-org/rav/better_stacktraces | Richard van der Hoff | 2018-10-02 | 3 | -22/+24 |
|\ \ \ \ \ | |||||
| * | | | | | Avoid reraise, to improve stacktraces | Richard van der Hoff | 2018-10-01 | 3 | -22/+24 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_state | Erik Johnston | 2018-10-02 | 2 | -2/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Newsfile | Erik Johnston | 2018-10-01 | 1 | -0/+1 |
| * | | | | Fix lazy loaded sync with rejected state events | Erik Johnston | 2018-10-01 | 1 | -2/+2 |
* | | | | | Update instructions to point to pip install (#3985) | Amber Brown | 2018-10-02 | 4 | -61/+29 |
* | | | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errors | Richard van der Hoff | 2018-10-01 | 3 | -118/+47 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors | Richard van der Hoff | 2018-09-27 | 31 | -38/+117 |
| |\ \ \ \ \ | |||||
| * | | | | | | Remove redundant, failing, test | Richard van der Hoff | 2018-09-27 | 1 | -106/+0 |
| * | | | | | | changelog | Richard van der Hoff | 2018-09-27 | 1 | -0/+1 |
| * | | | | | | Include event when resolving state for missing prevs | Richard van der Hoff | 2018-09-27 | 1 | -2/+16 |
| * | | | | | | Include state from remote servers in pdu handling | Richard van der Hoff | 2018-09-27 | 1 | -4/+19 |
| * | | | | | | Fix "unhashable type: 'list'" exception in federation handling | Richard van der Hoff | 2018-09-27 | 1 | -7/+12 |
* | | | | | | | Fix userconsent on Python 3 (#3938) | Amber Brown | 2018-10-02 | 6 | -96/+240 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #3933 from matrix-org/erikj/destination_retry_cache | Erik Johnston | 2018-10-01 | 3 | -3/+45 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Correctly match 'dict.pop' api | Erik Johnston | 2018-10-01 | 1 | -3/+11 |
| * | | | | | | Don't update eviction metrics on explicit removal | Erik Johnston | 2018-10-01 | 1 | -5/+0 |
| * | | | | | | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-28 | 51 | -426/+696 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-26 | 6 | -187/+440 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-25 | 51 | -62/+128 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix ExpiringCache.__len__ to be accurate | Erik Johnston | 2018-09-21 | 1 | -12/+9 |
| * | | | | | | | | Newsfile | Erik Johnston | 2018-09-21 | 1 | -0/+1 |
| * | | | | | | | | Add a five minute cache to get_destination_retry_timings | Erik Johnston | 2018-09-21 | 2 | -1/+35 |
| * | | | | | | | | Make ExpiringCache slightly more performant | Erik Johnston | 2018-09-21 | 1 | -1/+5 |
* | | | | | | | | | Further reduce the size of the docker image (#3972) | Richard van der Hoff | 2018-10-01 | 2 | -25/+47 |
* | | | | | | | | | add --no-admin flag to registration script (#3836) | Bruno Windels | 2018-09-28 | 2 | -4/+15 |
* | | | | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checks | Richard van der Hoff | 2018-09-28 | 3 | -30/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix complete fail to do the right thing | Richard van der Hoff | 2018-09-28 | 2 | -1/+3 |
| * | | | | | | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| * | | | | | | | | | remove spurious federation checks on localhost | Richard van der Hoff | 2018-09-26 | 1 | -31/+6 |
* | | | | | | | | | | Merge pull request #3980 from matrix-org/rav/remove_broken_cache_call | Richard van der Hoff | 2018-09-28 | 2 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Remove redundant call to start_get_pdu_cache | Richard van der Hoff | 2018-09-28 | 2 | -1/+1 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* / | | | | | | | | | build python 3 docker images on circle CI (#3976) | Jan Christian Grünhage | 2018-09-28 | 2 | -5/+12 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #3794 from matrix-org/erikj/faster_typing | Richard van der Hoff | 2018-09-27 | 2 | -3/+20 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing | Erik Johnston | 2018-09-19 | 177 | -1345/+2545 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2018-09-19 | 1 | -0/+1 |
| * | | | | | | | | | | Improve performance of getting typing updates for replication | Erik Johnston | 2018-09-05 | 1 | -3/+19 |
* | | | | | | | | | | | Merge pull request #3946 from matrix-org/michaelkaye/automate_docker_hub_upload | Richard van der Hoff | 2018-09-27 | 2 | -0/+27 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Do the changelog.d dance | Michael Kaye | 2018-09-27 | 1 | -0/+1 |
| * | | | | | | | | | | | Make a ":latest" tag, and a SHA1 commit ID one too. | Michael Kaye | 2018-09-27 | 1 | -3/+16 |
| * | | | | | | | | | | | Also, don't run this job on any branches | Michael Kaye | 2018-09-27 | 1 | -1/+3 |
| * | | | | | | | | | | | Make username configurable in the UI too | Michael Kaye | 2018-09-27 | 1 | -1/+1 |
| * | | | | | | | | | | | Fix typo | Michael Kaye | 2018-09-27 | 1 | -1/+1 |
| * | | | | | | | | | | | Build and push docker image to hub | Michael Kaye | 2018-09-27 | 1 | -0/+11 |
* | | | | | | | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanups | Richard van der Hoff | 2018-09-27 | 3 | -4/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | more comments | Richard van der Hoff | 2018-09-27 | 2 | -6/+3 |
| * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-09-27 | 1 | -0/+1 |
| * | | | | | | | | | | | Clarifications in FederationHandler | Richard van der Hoff | 2018-09-27 | 1 | -2/+11 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_process | Amber Brown | 2018-09-27 | 2 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| * | | | | | | | | | | | Run notify_app_services as a bg process | Richard van der Hoff | 2018-09-26 | 1 | -2/+6 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #3970 from schnuffle/develop-py3 | Amber Brown | 2018-09-27 | 19 | -19/+20 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Update 3970.bugfix | Amber Brown | 2018-09-27 | 1 | -1/+1 |
| * | | | | | | | | | | | Added changelog fragment | Schnuffle | 2018-09-27 | 1 | -0/+1 |
| * | | | | | | | | | | | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 18 | -19/+19 |
* | | | | | | | | | | | | Run our oldest supported configuration in CI (#3952) | Amber Brown | 2018-09-27 | 4 | -13/+38 |
* | | | | | | | | | | | | Merge pull request #3961 from matrix-org/neilj/lock_mau_upserts | Richard van der Hoff | 2018-09-27 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | towncrier | Neil Johnson | 2018-09-26 | 1 | -0/+1 |
| * | | | | | | | | | | | fix #3854 | Neil Johnson | 2018-09-26 | 1 | -1/+4 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2 | Richard van der Hoff | 2018-09-27 | 3 | -2/+17 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Logging improvements | Richard van der Hoff | 2018-09-26 | 3 | -2/+17 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Include eventid in log lines when processing incoming federation transactions... | Richard van der Hoff | 2018-09-27 | 6 | -57/+115 |
* | | | | | | | | | | | docstrings and unittests for storage.state (#3958) | Richard van der Hoff | 2018-09-27 | 3 | -8/+62 |
| |_|/ / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #3963 from matrix-org/rav/get_state_for_room_docstring | Amber Brown | 2018-09-27 | 2 | -4/+5 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| * | | | | | | | | | fix docstring for FederationClient.get_state_for_room | Richard van der Hoff | 2018-09-26 | 1 | -4/+4 |
|/ / / / / / / / / | |||||
* / / / / / / / / | Reduce the load on our CI (#3957) | Amber Brown | 2018-09-27 | 3 | -8/+30 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'develop' into rav/hacky_cache_factor_fix | Richard van der Hoff | 2018-09-26 | 6 | -315/+320 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_len | Richard van der Hoff | 2018-09-26 | 3 | -20/+25 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| | * | | | | | | | Log which cache is throwing exceptions | Richard van der Hoff | 2018-09-26 | 1 | -10/+17 |
| | * | | | | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| | * | | | | | | | Fix ExpiringCache.__len__ to be accurate | Erik Johnston | 2018-09-26 | 1 | -10/+7 |
| * | | | | | | | | Merge pull request #3948 from matrix-org/rav/no_symlink_synctl | Amber Brown | 2018-09-26 | 3 | -285/+285 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | changelog | Richard van der Hoff | 2018-09-25 | 1 | -0/+1 |
| | * | | | | | | | | Move synctl into top dir to avoid a symlink | Richard van der Hoff | 2018-09-25 | 2 | -285/+284 |
* | | | | | | | | | | Actuall set cache factors in workers | Erik Johnston | 2018-09-26 | 1 | -5/+15 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pdu | Amber Brown | 2018-09-26 | 3 | -24/+48 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | changelog | Richard van der Hoff | 2018-09-20 | 1 | -0/+1 |
| * | | | | | | | | Comments and interface cleanup for on_receive_pdu | Richard van der Hoff | 2018-09-20 | 2 | -24/+47 |
* | | | | | | | | | Merge pull request #3911 from matrix-org/jcgruenhage/docker-support-python3 | Richard van der Hoff | 2018-09-25 | 3 | -2/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update Dockerfile | Jan Christian Grünhage | 2018-09-25 | 1 | -1/+0 |
| * | | | | | | | | | Update .dockerignore | Jan Christian Grünhage | 2018-09-25 | 1 | -1/+0 |
| * | | | | | | | | | add changelog | Jan Christian Grünhage | 2018-09-20 | 1 | -0/+1 |
| * | | | | | | | | | make python 3 work in the docker container | Jan Christian Grünhage | 2018-09-20 | 3 | -2/+6 |
* | | | | | | | | | | Update grafana dashboard | Richard van der Hoff | 2018-09-25 | 1 | -175/+417 |
| |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches | Richard van der Hoff | 2018-09-25 | 17 | -39/+13 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | Newsfile | Erik Johnston | 2018-09-21 | 1 | -0/+1 |
| * | | | | | | | | Fix some instances of ExpiringCache not expiring cache items | Erik Johnston | 2018-09-21 | 16 | -39/+12 |
* | | | | | | | | | added "media-src: 'self'" to CSP for resources (#3578) | Jérémy Farnaud | 2018-09-25 | 2 | -0/+2 |
* | | | | | | | | | Merge pull request #3925 from matrix-org/erikj/fix_producers_unregistered | Richard van der Hoff | 2018-09-25 | 2 | -14/+36 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Newsfile | Erik Johnston | 2018-09-20 | 1 | -0/+1 |
| * | | | | | | | | | Fix spurious exceptions when client closes conncetion | Erik Johnston | 2018-09-20 | 1 | -14/+35 |
* | | | | | | | | | | Merge pull request #3947 from matrix-org/rav/attr_version | Richard van der Hoff | 2018-09-25 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | changelog | Richard van der Hoff | 2018-09-25 | 1 | -0/+1 |
| * | | | | | | | | | We require attrs 16.0.0 | Richard van der Hoff | 2018-09-25 | 1 | -1/+3 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Only lazy load self-members on initial sync | Matthew Hodgson | 2018-09-25 | 2 | -5/+9 |
* | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-09-25 | 3 | -3/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge tag 'v0.33.5.1' | Amber Brown | 2018-09-25 | 3 | -3/+13 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | changelog v0.33.5.1 github/release-v0.33.5.1 release-v0.33.5.1 | Amber Brown | 2018-09-25 | 2 | -2/+10 |
| | * | | | | | | | | | bump version | Amber Brown | 2018-09-25 | 1 | -1/+1 |
| | * | | | | | | | | | changelog for 3940 | Amber Brown | 2018-09-25 | 1 | -0/+2 |
| | * | | | | | | | | | Fix compatibility issue with older Twisted in tests. | Oleg Girko | 2018-09-25 | 1 | -2/+2 |
* | | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-09-24 | 42 | -40/+65 |
|\| | | | | | | | | | | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge tag 'v0.33.5' | Amber Brown | 2018-09-24 | 87 | -1091/+1998 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | towncrier v0.33.5 github/release-v0.33.5 release-v0.33.5 | Amber Brown | 2018-09-24 | 1 | -0/+6 |
| | * | | | | | | | | update version | Amber Brown | 2018-09-24 | 1 | -1/+1 |
| | * | | | | | | | | changelog v0.33.5rc1 | Amber Brown | 2018-09-17 | 41 | -39/+58 |
| | * | | | | | | | | update python 3 changelog | Amber Brown | 2018-09-17 | 1 | -1/+1 |