summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-2490-971/+2312
|\
| * fix branch regexpRichard van der Hoff2018-10-241-1/+1
| * also build on release branchesRichard van der Hoff2018-10-241-0/+1
| * Disable travis-ci branch builds for most branchesRichard van der Hoff2018-10-241-0/+6
| * Merge pull request #4083 from matrix-org/rav/fix_event_filter_validationRichard van der Hoff2018-10-243-2/+16
| |\
| | * Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_valid...Richard van der Hoff2018-10-2421-81/+1344
| | |\ | | |/ | |/|
| * | Merge pull request #4082 from matrix-org/rav/fix_pep8Richard van der Hoff2018-10-2412-20/+21
| |\ \
| | * | Fix a number of flake8 errorsRichard van der Hoff2018-10-2412-20/+21
| * | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebaseErik Johnston2018-10-249-61/+1323
| |\ \ \ | | |/ / | |/| |
| | * | isortErik Johnston2018-10-241-4/+1
| | * | CommentErik Johnston2018-10-241-2/+5
| | * | Rename resolve_events_with_factoryErik Johnston2018-10-245-13/+13
| | * | Update event_auth table for rejected eventsErik Johnston2018-10-161-15/+21
| | * | Fix up use of resolve_events_with_factoryErik Johnston2018-10-161-13/+10
| | * | NewsfileErik Johnston2018-10-161-0/+1
| | * | Add some state res v2 testsErik Johnston2018-10-162-0/+666
| | * | User event.sender rather than alias event.user_idErik Johnston2018-10-161-1/+1
| | * | Add v2 state res algorithm.Erik Johnston2018-10-163-24/+616
| | | * Allow backslashes in event field filtersRichard van der Hoff2018-10-243-2/+16
| | |/ | |/|
| * | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontextsRichard van der Hoff2018-10-248-141/+142
| |\ \
| | * | Fix start_pushers vs _start_pushers confusionRichard van der Hoff2018-10-241-3/+3
| | * | sanity-check the is_processing flagRichard van der Hoff2018-10-242-8/+14
| | * | ChangelogRichard van der Hoff2018-10-221-0/+1
| | * | Run PusherPool.start as a background processRichard van der Hoff2018-10-221-5/+7
| | * | Make on_started synchronous tooRichard van der Hoff2018-10-223-11/+21
| | * | Remove redundant run_as_background_process() from pusherpoolRichard van der Hoff2018-10-227-50/+14
| | * | Give pushers their own background logcontextRichard van der Hoff2018-10-222-58/+54
| | * | move get_all_pushers call downRichard van der Hoff2018-10-221-3/+9
| | * | Factor PusherPool._start_pusher out of _start_pushersRichard van der Hoff2018-10-221-18/+33
| | * | Rename _refresh_pusherRichard van der Hoff2018-10-222-3/+4
| * | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creationErik Johnston2018-10-244-64/+56
| |\ \ \
| | * | | NewsfileErik Johnston2018-10-191-0/+1
| | * | | Clean up room alias creationErik Johnston2018-10-193-64/+55
| * | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requestsTravis Ralston2018-10-233-8/+23
| |\ \ \ \
| | * | | | Comments helpTravis Ralston2018-10-231-0/+5
| | * | | | isortTravis Ralston2018-10-121-1/+1
| | * | | | More sane handling of group errors and pep8Travis Ralston2018-10-121-4/+5
| | * | | | Merge branch 'develop' into travis/fix-federated-group-requestsTravis Ralston2018-10-12120-924/+1167
| | |\ \ \ \
| | * | | | | Remove debugging statementTravis Ralston2018-09-261-1/+0
| | * | | | | ChangelogTravis Ralston2018-09-261-0/+1
| | * | | | | Handle HttpResponseException more safely for federated groupsTravis Ralston2018-09-261-2/+11
| | * | | | | Fix exception documentation in matrixfederationclient.pyTravis Ralston2018-09-261-6/+6
| * | | | | | Give some more things logcontexts (#4077)Richard van der Hoff2018-10-233-7/+12
| * | | | | | Correctly account for cpu usage by background threads (#4074)Richard van der Hoff2018-10-236-80/+97
| * | | | | | Merge pull request #3698 from spantaleev/add-matrix-docker-ansible-deployRichard van der Hoff2018-10-232-0/+7
| |\ \ \ \ \ \
| | * | | | | | Add information about the matrix-docker-ansible-deploy playbookSlavi Pantaleev2018-10-142-0/+7
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #4076 from matrix-org/rav/fix_init_logcontextsRichard van der Hoff2018-10-222-8/+23
| |\ \ \ \ \ \
| | * | | | | | Run MAU queries as background processesRichard van der Hoff2018-10-202-8/+23
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #4073 from matrix-org/rav/require_psutilRichard van der Hoff2018-10-223-10/+6
| |\ \ \ \ \ \
| | * | | | | | Make psutil an explicit dependencyRichard van der Hoff2018-10-193-10/+6
| | |/ / / / /
| * | | | | | uh, Matrix is called Matrix these days...Matthew Hodgson2018-10-211-2/+4
| * | | | | | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on...Amber Brown2018-10-2027-518/+511
| |/ / / / /
| * | | | | Merge branch 'rav/fix_email_templates_4065' into developRichard van der Hoff2018-10-192-8/+0
| |\ \ \ \ \
| | * | | | | Remove notes on fallback for email_templatesRichard van der Hoff2018-10-192-8/+0
| * | | | | | Merge pull request #4069 from matrix-org/rav/fix_email_templates_4065Richard van der Hoff2018-10-193-28/+21
| |\| | | | |
| | * | | | | Calculate absolute path for email templatesRichard van der Hoff2018-10-193-28/+21
| * | | | | | Fix manhole on py3 (pt 2) (#4067)Amber Brown2018-10-192-0/+3
| * | | | | | Make the metrics less racy (#4061)Amber Brown2018-10-193-16/+22
| * | | | | | Merge pull request #4060 from matrix-org/hawkowl/ssh-key-py3Richard van der Hoff2018-10-192-2/+3
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | changelogAmber Brown2018-10-191-0/+1
| | * | | | | make a bytestringAmber Brown2018-10-191-2/+2
| |/ / / / /
| * | | | | Merge pull request #4057 from matrix-org/rav/use_correct_pythonAmber Brown2018-10-192-1/+3
| |\ \ \ \ \
| | * | | | | Use the right python when starting workersRichard van der Hoff2018-10-182-1/+3
| |/ / / / /
| * | | | | Merge branch 'master' into developRichard van der Hoff2018-10-181-0/+17
| |\| | | |
| | * | | | Add warnings about the upgrade to 0.33.7 github/release-v0.33.7 release-v0.33.7Richard van der Hoff2018-10-181-0/+17
* | | | | | Fix terms UI auth testTravis Ralston2018-10-181-2/+5
* | | | | | Test for terms UI authTravis Ralston2018-10-181-0/+70
* | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1843-163/+308
|\| | | | |
| * | | | | remove redundant changelog fileRichard van der Hoff2018-10-181-1/+0
| * | | | | Merge branch 'master' into developRichard van der Hoff2018-10-1824-18/+101
| |\| | | |
| | * | | | 0.33.7 v0.33.7Richard van der Hoff2018-10-182-3/+6
| | * | | | fix changelog formatting v0.33.7rc2Richard van der Hoff2018-10-171-1/+4
| | * | | | v0.33.7rc2Richard van der Hoff2018-10-171-1/+1
| | * | | | prep changelogRichard van der Hoff2018-10-173-13/+25
| | * | | | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-175-35/+26
| | * | | | Merge pull request #4052 from matrix-org/rav/ship_resources_as_package_dataRichard van der Hoff2018-10-1713-6/+53
| | |\ \ \ \
| | | * | | | Put the warning blob at the top of the fileRichard van der Hoff2018-10-171-6/+9
| | | * | | | Ship the email templates as package_dataRichard van der Hoff2018-10-1713-6/+50
| | |/ / / /
| | * | | | update changelog v0.33.7rc1Amber Brown2018-10-1511-10/+28
| | * | | | update changelogAmber Brown2018-10-151-2/+1
| | * | | | version bumpAmber Brown2018-10-151-1/+1
| * | | | | Merge pull request #4049 from matrix-org/erikj/synctl_colourErik Johnston2018-10-182-1/+11
| |\ \ \ \ \
| | * | | | | Assume isatty is always defined, and catch AttributeError. Also don't bother ...Erik Johnston2018-10-171-2/+6
| | * | | | | NewsfileErik Johnston2018-10-171-0/+1
| | * | | | | Only colourise synctl output when attached to ttyErik Johnston2018-10-171-1/+6
| * | | | | | Merge pull request #4050 from matrix-org/erikj/fix_py37_iterationErik Johnston2018-10-172-2/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | NewsfileErik Johnston2018-10-171-0/+1
| | * | | | | Fix bug where we raised StopIteration in a generatorErik Johnston2018-10-171-2/+5
| |/ / / / /
| * | | | | Fix roomlist since tokens on Python 3 (#4046)Will Hunt2018-10-174-3/+50
| * | | | | Merge pull request #4045 from matrix-org/rav/fix_get_missing_eventsRichard van der Hoff2018-10-175-35/+26
| |\ \ \ \ \
| | * | | | | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-165-35/+26
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #4041 from matrix-org/rav/run_tests_in_dockerAmber Brown2018-10-173-43/+51
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Use wget rather than curlRichard van der Hoff2018-10-161-2/+2
| | * | | | changelogRichard van der Hoff2018-10-161-0/+1
| | * | | | run the circle builds in docker containersRichard van der Hoff2018-10-161-41/+48
| |/ / / /
| * / / / Various cleanups in the federation client code (#4031)Richard van der Hoff2018-10-164-61/+64
| |/ / /
* | | | pep8Travis Ralston2018-10-153-14/+3
* | | | Ensure the terms params are actually providedTravis Ralston2018-10-151-0/+1
* | | | Python is hardTravis Ralston2018-10-151-5/+6
* | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1513-3/+1447
|\| | |
| * | | Merge pull request #4019 from matrix-org/dbkr/e2e_backupsDavid Baker2018-10-1510-0/+1442
| |\ \ \
| | * | | missed oneDavid Baker2018-10-121-0/+1
| | * | | Linting soothes the savage PEP8 monsterDavid Baker2018-10-121-4/+9
| | * | | Misc PR feedback bitsDavid Baker2018-10-121-2/+2
| | * | | Don't mangle exceptionsDavid Baker2018-10-121-4/+2
| | * | | Split /room_keys/version into 2 servletsDavid Baker2018-10-121-9/+21
| | * | | PR feedback pt. 1David Baker2018-10-123-29/+22
| | * | | Fix mergefailDavid Baker2018-10-091-1/+1
| | * | | Add changelogDavid Baker2018-10-091-0/+1
| | * | | isortDavid Baker2018-10-091-1/+1
| | * | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-09210-3221/+5551
| | |\ \ \
| | * | | | Apparently this blank line is Very ImportantDavid Baker2018-10-091-0/+1
| | * | | | be python3 compatibleDavid Baker2018-10-091-2/+3
| | * | | | Don't reuse backup versionsDavid Baker2018-10-052-3/+9
| | * | | | WIP e2e key backupsDavid Baker2018-09-132-4/+10
| | * | | | try to make flake8 and isort happyHubert Chathi2018-09-065-8/+15
| | * | | | update to newer Synapse APIsHubert Chathi2018-08-242-1/+2
| | * | | | Merge branch 'develop' into e2e_backupsHubert Chathi2018-08-24232-4107/+7197
| | |\ \ \ \
| | * | | | | allow session_data to be any JSON instead of just a stringHubert Chathi2018-08-211-2/+4
| | * | | | | allow auth_data to be any JSON instead of a stringHubert Chathi2018-08-211-2/+5
| | * | | | | missing importMatthew Hodgson2018-08-121-1/+1
| | * | | | | missing importMatthew Hodgson2018-08-121-0/+1
| | * | | | | use parse_stringMatthew Hodgson2018-08-121-3/+3
| | * | | | | 404 nicely if you try to interact with a missing current versionMatthew Hodgson2018-08-122-16/+57
| | * | | | | support DELETE /version with no argsMatthew Hodgson2018-08-122-3/+4
| | * | | | | flake8Matthew Hodgson2018-08-122-9/+14
| | * | | | | implement remaining tests and make them workMatthew Hodgson2018-08-124-33/+287
| | * | | | | lintingMatthew Hodgson2018-08-121-25/+23
| | * | | | | fix idiocies and so make tests passMatthew Hodgson2018-08-123-11/+15
| | * | | | | first cut at a UTMatthew Hodgson2018-08-121-0/+141
| | * | | | | don't needlessly return user_idMatthew Hodgson2018-08-121-1/+0
| | * | | | | improve docstringMatthew Hodgson2018-08-121-1/+5
| | * | | | | switch get_current_version_info back to being get_version_infoMatthew Hodgson2018-08-121-4/+7
| | * | | | | fix flakesMatthew Hodgson2018-08-122-4/+6
| | * | | | | fix typosMatthew Hodgson2018-08-122-2/+3
| | * | | | | add a tonne of docstring; make upload_room_keys properly assert versionMatthew Hodgson2018-08-122-9/+113
| | * | | | | add a tonne of docstring; make upload_room_keys properly assert versionMatthew Hodgson2018-08-121-20/+31
| | * | | | | more docstring for the e2e_room_keys restMatthew Hodgson2018-08-122-2/+51
| | * | | | | add storage docstring; remove unused set_e2e_room_keysMatthew Hodgson2018-08-121-36/+83
| | * | | | | fix factoring out of _should_replace_room_keyMatthew Hodgson2018-08-121-3/+4
| | * | | | | rename room_key_version table correctly, and fix opt argsMatthew Hodgson2018-08-122-16/+16
| | * | | | | blindly incorporate PR review - needs testing & fixingMatthew Hodgson2018-08-125-79/+99
| | * | | | | make /room_keys/version workMatthew Hodgson2018-08-124-15/+38
| | * | | | | implement /room_keys/version too (untested)Matthew Hodgson2018-08-125-6/+171
| | * | | | | document the APIMatthew Hodgson2018-08-121-0/+133
| | * | | | | make it work and fix pep8Matthew Hodgson2018-08-127-82/+134
| | * | | | | interim WIP checkin; doesn't build yetMatthew Hodgson2018-08-123-19/+84
| | * | | | | total WIP skeleton for /room_keys APIMatthew Hodgson2018-08-124-0/+289
| * | | | | | Merge pull request #4033 from intelfx/py37-hotfixesAmber Brown2018-10-153-3/+5
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | synapse/app: frontend_proxy.py: actually make workers work on py3Ivan Shapovalov2018-10-142-2/+3
| | * | | | | synapse/visibility.py: fix SyntaxError on py3.7Ivan Shapovalov2018-10-142-1/+2
| |/ / / / /
* | | | | | Update login terms structure for the proposed language supportTravis Ralston2018-10-121-4/+7
* | | | | | Rely on the lack of ?u to represent public accessTravis Ralston2018-10-122-10/+6
* | | | | | Update documentation and templates for new consentTravis Ralston2018-10-122-10/+18
* | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1285-190/+313
|\| | | | |
| * | | | | Make workers work on Py3 (#4027)Amber Brown2018-10-1313-62/+64
| * | | | | Comments on get_all_new_events_streamRichard van der Hoff2018-10-121-1/+15
| * | | | | Merge pull request #4022 from matrix-org/erikj/metrics_lazy_loaded_countErik Johnston2018-10-102-8/+33
| |\ \ \ \ \
| | * | | | | Add description to counter metricErik Johnston2018-10-101-1/+5
| | * | | | | Update newsfileErik Johnston2018-10-101-1/+1
| | * | | | | Track number of non-empty sync responses insteadErik Johnston2018-10-101-9/+15
| | * | | | | Append _total to metric and fix up spellingErik Johnston2018-10-101-2/+2
| | * | | | | NewsfileErik Johnston2018-10-091-0/+1
| | * | | | | Add metric to count lazy member sync requestsErik Johnston2018-10-091-6/+20
| |/ / / / /
| * | | | | Merge pull request #4008 from matrix-org/erikj/log_looping_exceptionsErik Johnston2018-10-093-13/+36
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Remove unnecessary extra function call layerErik Johnston2018-10-082-31/+16
| | * | | | Use errback pattern and catch async failuresErik Johnston2018-10-082-15/+35
| | * | | | NewsfileErik Johnston2018-10-051-0/+1
| | * | | | Log looping call exceptionsErik Johnston2018-10-051-1/+18
| * | | | | Merge pull request #4017 from matrix-org/rav/optimise_filter_events_for_serverRichard van der Hoff2018-10-092-7/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Optimisation for filter_events_for_serverRichard van der Hoff2018-10-082-7/+7
| |/ / / /
| * | | | Merge pull request #3995 from matrix-org/rav/no_deextrem_outliersRichard van der Hoff2018-10-042-33/+70
| |\ \ \ \
| | * | | | actually exclude outliersRichard van der Hoff2018-10-031-1/+2
| | * | | | fix newsfile nameRichard van der Hoff2018-10-031-0/+0
| | * | | | remove debuggingRichard van der Hoff2018-10-021-10/+0
| | * | | | Fix bug in forward_extremity update logicRichard van der Hoff2018-10-022-33/+79
| * | | | | Merge branch 'master' into developAmber Brown2018-10-0463-66/+88
| |\ \ \ \ \
| | * | | | | changelog v0.33.6 github/release-v0.33.6 release-v0.33.6Amber Brown2018-10-042-1/+9
| | * | | | | full versionAmber Brown2018-10-041-1/+1
| | * | | | | Merge pull request #4002 from matrix-org/rav/pin_prometheusRichard van der Hoff2018-10-032-1/+5
| | |\ \ \ \ \
| | | * | | | | Pin to prometheus_client<0.4 to avoid renaming all of our metricsRichard van der Hoff2018-10-032-1/+5
| | |/ / / / /
| | * | | | | Merge pull request #3998 from matrix-org/michaelkaye/build_docker_images_of_r...Richard van der Hoff2018-10-031-1/+1
| | |\ \ \ \ \
| | | * | | | | Docker build all tags starting vX.Y.Z, inc RCsMichael Kaye2018-10-031-1/+1
| | |/ / / / /
| | * | | | | some changelog fixesAmber Brown2018-10-031-8/+4
| | * | | | | changelog v0.33.6rc1Amber Brown2018-10-0360-61/+75
| | * | | | | versionAmber Brown2018-10-031-1/+1
| | |/ / / /
* | | | | | ChangelogTravis Ralston2018-10-031-0/+1
* | | | | | Use a flag rather than a new route for the public policyTravis Ralston2018-10-033-17/+25
* | | | | | Auto-consent to the privacy policy if the user registered with termsTravis Ralston2018-10-031-0/+6
* | | | | | Make the terms flow requriedTravis Ralston2018-10-031-4/+4
* | | | | | Flesh out the fallback auth for termsTravis Ralston2018-10-031-7/+67
* | | | | | Supply params for terms auth stageTravis Ralston2018-10-031-0/+9
* | | | | | Incorporate Dave's work for GDPR login flowsTravis Ralston2018-10-034-0/+40
|/ / / / /
* | | | | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetionErik Johnston2018-10-032-5/+3
|\ \ \ \ \
| * | | | | Sanitise error messages when user doesn't have permission to inviteErik Johnston2018-10-031-5/+2
| * | | | | NewsfileErik Johnston2018-10-031-0/+1
| * | | | | Fix handling of rejected threepid invitesErik Johnston2018-10-031-1/+1
| |/ / / /
* | | | | Merge pull request #3996 from matrix-org/erikj/fix_bg_iterationErik Johnston2018-10-032-2/+7
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2018-10-031-0/+1
| * | | | | Fix exception in background metrics collectionErik Johnston2018-10-031-2/+6
| |/ / / /
* | | | | Merge pull request #3997 from matrix-org/erikj/fix_profile_error_handlingErik Johnston2018-10-032-6/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | NewsfileErik Johnston2018-10-031-0/+1
| * | | | Fix exception handling in fetching remote profilesErik Johnston2018-10-031-6/+2
|/ / / /
* | | | Merge pull request #3991 from matrix-org/erikj/fix_pop_retry_cacheErik Johnston2018-10-023-1/+47
|\ \ \ \
| * | | | Add testsErik Johnston2018-10-021-0/+45
| * | | | NewsfileErik Johnston2018-10-021-0/+1
| * | | | Fix bug when invalidating destination retry timingsErik Johnston2018-10-021-1/+1
* | | | | Remove Jenkins & other old dev junk (#3988)Amber Brown2018-10-0312-278/+4
|/ / / /
* | | | Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_errorRichard van der Hoff2018-10-022-2/+3
|\ \ \ \
| * \ \ \ Merge branch 'develop' into rav/fix_missing_create_event_errorRichard van der Hoff2018-10-0168-442/+779
| |\ \ \ \
| * | | | | changelogRichard van der Hoff2018-09-261-0/+1
| * | | | | Fix error handling for missing auth_eventRichard van der Hoff2018-09-261-2/+2
* | | | | | Disable frozen dicts by default (#3987)Amber Brown2018-10-024-5/+18
* | | | | | Merge pull request #3990 from matrix-org/erikj/fix_logging_lost_connectionErik Johnston2018-10-022-6/+22
|\ \ \ \ \ \
| * | | | | | NewsfileErik Johnston2018-10-021-0/+1
| * | | | | | Fix error when logging incomplete requestsErik Johnston2018-10-021-6/+21
|/ / / / / /
* | | | | | Merge pull request #3989 from matrix-org/rav/better_stacktracesRichard van der Hoff2018-10-023-22/+24
|\ \ \ \ \ \
| * | | | | | Avoid reraise, to improve stacktracesRichard van der Hoff2018-10-013-22/+24
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_stateErik Johnston2018-10-022-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | NewsfileErik Johnston2018-10-011-0/+1
| * | | | | Fix lazy loaded sync with rejected state eventsErik Johnston2018-10-011-2/+2
* | | | | | Update instructions to point to pip install (#3985)Amber Brown2018-10-024-61/+29
* | | | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errorsRichard van der Hoff2018-10-013-118/+47
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errorsRichard van der Hoff2018-09-2731-38/+117
| |\ \ \ \ \ \
| * | | | | | | Remove redundant, failing, testRichard van der Hoff2018-09-271-106/+0
| * | | | | | | changelogRichard van der Hoff2018-09-271-0/+1
| * | | | | | | Include event when resolving state for missing prevsRichard van der Hoff2018-09-271-2/+16
| * | | | | | | Include state from remote servers in pdu handlingRichard van der Hoff2018-09-271-4/+19
| * | | | | | | Fix "unhashable type: 'list'" exception in federation handlingRichard van der Hoff2018-09-271-7/+12
* | | | | | | | Fix userconsent on Python 3 (#3938)Amber Brown2018-10-026-96/+240
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #3933 from matrix-org/erikj/destination_retry_cacheErik Johnston2018-10-013-3/+45
|\ \ \ \ \ \ \
| * | | | | | | Correctly match 'dict.pop' apiErik Johnston2018-10-011-3/+11
| * | | | | | | Don't update eviction metrics on explicit removalErik Johnston2018-10-011-5/+0
| * | | | | | | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cacheRichard van der Hoff2018-09-2851-426/+696
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cacheRichard van der Hoff2018-09-266-187/+440
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cacheRichard van der Hoff2018-09-2551-62/+128
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix ExpiringCache.__len__ to be accurateErik Johnston2018-09-211-12/+9
| * | | | | | | | | NewsfileErik Johnston2018-09-211-0/+1
| * | | | | | | | | Add a five minute cache to get_destination_retry_timingsErik Johnston2018-09-212-1/+35
| * | | | | | | | | Make ExpiringCache slightly more performantErik Johnston2018-09-211-1/+5
* | | | | | | | | | Further reduce the size of the docker image (#3972)Richard van der Hoff2018-10-012-25/+47
* | | | | | | | | | add --no-admin flag to registration script (#3836)Bruno Windels2018-09-282-4/+15
* | | | | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checksRichard van der Hoff2018-09-283-30/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix complete fail to do the right thingRichard van der Hoff2018-09-282-1/+3
| * | | | | | | | | | changelogRichard van der Hoff2018-09-261-0/+1
| * | | | | | | | | | remove spurious federation checks on localhostRichard van der Hoff2018-09-261-31/+6
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3980 from matrix-org/rav/remove_broken_cache_callRichard van der Hoff2018-09-282-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove redundant call to start_get_pdu_cacheRichard van der Hoff2018-09-282-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* / | | | | | | | | build python 3 docker images on circle CI (#3976)Jan Christian Grünhage2018-09-282-5/+12
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3794 from matrix-org/erikj/faster_typingRichard van der Hoff2018-09-272-3/+20
|\ \ \ \ \ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 23:14:02 +0000