summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4051 from matrix-org/erikj/alias_disallow_listErik Johnston2018-10-255-15/+140
|\
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa...Erik Johnston2018-10-2546-443/+1124
| |\
| * | Use allow/denyErik Johnston2018-10-251-6/+6
| * | Use match rather than searchErik Johnston2018-10-241-2/+3
| * | Anchor returned regex to start and end of stringErik Johnston2018-10-191-2/+6
| * | Add config option to control alias creationErik Johnston2018-10-195-15/+135
* | | Merge pull request #4081 from matrix-org/neilj/fix_mau_initNeil Johnson2018-10-254-31/+84
|\ \ \ | |_|/ |/| |
| * | add new lineNeil Johnson2018-10-251-0/+1
| * | improve commentsNeil Johnson2018-10-251-6/+6
| * | fix style inconsistenciesNeil Johnson2018-10-242-15/+47
| * | commit transaction before closingNeil Johnson2018-10-241-0/+1
| * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_initNeil Johnson2018-10-2431-368/+994
| |\ \
| * | | remove white spaceNeil Johnson2018-10-231-2/+1
| * | | fix race condiftion in calling initialise_reserved_usersNeil Johnson2018-10-233-25/+45
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea...Neil Johnson2018-10-2583-676/+2779
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_valid...Richard van der Hoff2018-10-2412-67/+665
| |\ \ \
| | * \ \ Merge pull request #4082 from matrix-org/rav/fix_pep8Richard van der Hoff2018-10-246-6/+6
| | |\ \ \
| | | * | | Fix a number of flake8 errorsRichard van der Hoff2018-10-246-6/+6
| | * | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebaseErik Johnston2018-10-246-61/+659
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | CommentErik Johnston2018-10-241-2/+5
| | | * | | Rename resolve_events_with_factoryErik Johnston2018-10-244-11/+11
| | | * | | 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
| | | * | | 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-241-1/+4
| |/ / / /
| * | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontextsRichard van der Hoff2018-10-247-141/+141
| |\ \ \ \
| | * | | | 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
| | * | | | 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-243-64/+55
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Clean up room alias creationErik Johnston2018-10-193-64/+55
| * | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requestsTravis Ralston2018-10-232-8/+22
| |\ \ \ \ \
| | * | | | | 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-1249-314/+590
| | |\ \ \ \ \
| | * | | | | | Remove debugging statementTravis Ralston2018-09-261-1/+0
| | * | | | | | 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-232-7/+11
| * | | | | | | Correctly account for cpu usage by background threads (#4074)Richard van der Hoff2018-10-235-80/+96
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #4076 from matrix-org/rav/fix_init_logcontextsRichard van der Hoff2018-10-221-8/+22
| |\ \ \ \ \ \
| | * | | | | | Run MAU queries as background processesRichard van der Hoff2018-10-201-8/+22
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #4073 from matrix-org/rav/require_psutilRichard van der Hoff2018-10-222-10/+5
| |\ \ \ \ \ \
| | * | | | | | Make psutil an explicit dependencyRichard van der Hoff2018-10-192-10/+5
| | |/ / / / /
| * / / / / / Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on...Amber Brown2018-10-209-71/+70
| |/ / / / /
| * | | | | Merge pull request #4069 from matrix-org/rav/fix_email_templates_4065Richard van der Hoff2018-10-192-28/+20
| |\ \ \ \ \
| | * | | | | Calculate absolute path for email templatesRichard van der Hoff2018-10-192-28/+20
| * | | | | | Fix manhole on py3 (pt 2) (#4067)Amber Brown2018-10-191-0/+2
| * | | | | | Make the metrics less racy (#4061)Amber Brown2018-10-192-16/+21
| * | | | | | make a bytestringAmber Brown2018-10-191-2/+2
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'master' into developRichard van der Hoff2018-10-1811-5/+369
| |\| | | |
| | * | | | 0.33.7 v0.33.7Richard van der Hoff2018-10-181-1/+1
| | * | | | v0.33.7rc2Richard van der Hoff2018-10-171-1/+1
| | * | | | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-174-35/+25
| | * | | | 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-1710-4/+365
| | * | | | version bumpAmber Brown2018-10-151-1/+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-172-3/+10
| * | | | | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-164-35/+25
| | |_|_|/ | |/| | |
| * | | | Various cleanups in the federation client code (#4031)Richard van der Hoff2018-10-163-61/+63
| |/ / /
| * | | Merge pull request #4019 from matrix-org/dbkr/e2e_backupsDavid Baker2018-10-158-0/+1044
| |\ \ \
| | * | | 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
| | * | | isortDavid Baker2018-10-091-1/+1
| | * | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-09115-1523/+2315
| | |\ \ \
| | * | | | 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-064-4/+10
| | * | | | update to newer Synapse APIsHubert Chathi2018-08-241-1/+1
| | * | | | Merge branch 'develop' into e2e_backupsHubert Chathi2018-08-24116-1483/+3715
| | |\ \ \ \
| | * | | | | 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-121-16/+35
| | * | | | | support DELETE /version with no argsMatthew Hodgson2018-08-122-3/+4
| | * | | | | flake8Matthew Hodgson2018-08-121-1/+1
| | * | | | | implement remaining tests and make them workMatthew Hodgson2018-08-123-8/+36
| | * | | | | fix idiocies and so make tests passMatthew Hodgson2018-08-122-3/+4
| | * | | | | 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
| * | | | | | synapse/app: frontend_proxy.py: actually make workers work on py3Ivan Shapovalov2018-10-141-2/+2
| * | | | | | synapse/visibility.py: fix SyntaxError on py3.7Ivan Shapovalov2018-10-141-1/+1
| | |_|_|_|/ | |/| | | |
| * | | | | Make workers work on Py3 (#4027)Amber Brown2018-10-1311-61/+62
| * | | | | Comments on get_all_new_events_streamRichard van der Hoff2018-10-121-1/+15
| * | | | | Add description to counter metricErik Johnston2018-10-101-1/+5
| * | | | | 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
| * | | | | 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-092-13/+35
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Remove unnecessary extra function call layerErik Johnston2018-10-082-31/+16
| | * | | | Use errback pattern and catch async failuresErik Johnston2018-10-082-15/+35
| | * | | | Log looping call exceptionsErik Johnston2018-10-051-1/+18
| * | | | | Optimisation for filter_events_for_serverRichard van der Hoff2018-10-081-7/+6
| |/ / / /
* | | | | isortNeil Johnson2018-10-241-2/+1
* | | | | remove trailing whiter spaceNeil Johnson2018-10-241-1/+1
* | | | | fix tupleRichard van der Hoff2018-10-241-1/+2
* | | | | remove errant exception and styleNeil Johnson2018-10-232-6/+6
* | | | | clean up config error logic and importsNeil Johnson2018-10-172-19/+20
* | | | | no need to join room if creatorNeil Johnson2018-10-131-1/+2
* | | | | improve auto room join logic, comments and testsNeil Johnson2018-10-122-4/+18
* | | | | Merge branch 'develop' into matthew/autocreate_autojoinNeil Johnson2018-10-0417-130/+240
|\| | | |
| * | | | Merge pull request #3995 from matrix-org/rav/no_deextrem_outliersRichard van der Hoff2018-10-041-33/+69
| |\ \ \ \
| | * | | | actually exclude outliersRichard van der Hoff2018-10-031-1/+2
| | * | | | remove debuggingRichard van der Hoff2018-10-021-10/+0
| | * | | | Fix bug in forward_extremity update logicRichard van der Hoff2018-10-021-33/+78
| * | | | | Merge branch 'master' into developAmber Brown2018-10-042-2/+5
| |\ \ \ \ \
| | * | | | | full versionAmber Brown2018-10-041-1/+1
| | * | | | | Pin to prometheus_client<0.4 to avoid renaming all of our metricsRichard van der Hoff2018-10-031-1/+4
| | * | | | | versionAmber Brown2018-10-031-1/+1
| | |/ / / /
| * | | | | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetionErik Johnston2018-10-031-5/+2
| |\ \ \ \ \
| | * | | | | Sanitise error messages when user doesn't have permission to inviteErik Johnston2018-10-031-5/+2
| | * | | | | Fix handling of rejected threepid invitesErik Johnston2018-10-031-1/+1
| | |/ / / /
| * | | | | Merge pull request #3996 from matrix-org/erikj/fix_bg_iterationErik Johnston2018-10-031-2/+6
| |\ \ \ \ \
| | * | | | | Fix exception in background metrics collectionErik Johnston2018-10-031-2/+6
| | |/ / / /
| * / / / / Fix exception handling in fetching remote profilesErik Johnston2018-10-031-6/+2
| |/ / / /
| * | | | Fix bug when invalidating destination retry timingsErik Johnston2018-10-021-1/+1
| * | | | Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_errorRichard van der Hoff2018-10-021-2/+2
| |\ \ \ \
| | * \ \ \ Merge branch 'develop' into rav/fix_missing_create_event_errorRichard van der Hoff2018-10-0130-142/+299
| | |\ \ \ \
| | * | | | | Fix error handling for missing auth_eventRichard van der Hoff2018-09-261-2/+2
| | | |_|_|/ | | |/| | |
| * | | | | Disable frozen dicts by default (#3987)Amber Brown2018-10-021-3/+10
| * | | | | 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-022-22/+23
| |\ \ \ \ \
| | * | | | | Avoid reraise, to improve stacktracesRichard van der Hoff2018-10-012-22/+23
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_stateErik Johnston2018-10-021-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix lazy loaded sync with rejected state eventsErik Johnston2018-10-011-2/+2
| * | | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errorsRichard van der Hoff2018-10-011-12/+46
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errorsRichard van der Hoff2018-09-2720-36/+60
| | |\ \ \ \ \
| | * | | | | | 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-021-1/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #3933 from matrix-org/erikj/destination_retry_cacheErik Johnston2018-10-012-3/+44
| |\ \ \ \ \ \
| | * | | | | | 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-2827-403/+248
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cacheRichard van der Hoff2018-09-261-10/+17
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cacheRichard van der Hoff2018-09-255-21/+48
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix ExpiringCache.__len__ to be accurateErik Johnston2018-09-211-12/+9
| | * | | | | | | | 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
| * | | | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checksRichard van der Hoff2018-09-282-30/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix complete fail to do the right thingRichard van der Hoff2018-09-282-1/+3
| | * | | | | | | | | remove spurious federation checks on localhostRichard van der Hoff2018-09-261-31/+6
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Remove redundant call to start_get_pdu_cacheRichard van der Hoff2018-09-281-1/+0
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | move logic into register, fix room alias localpart bug, testsNeil Johnson2018-10-041-27/+18
* | | | | | | | | emit room aliases eventMatthew Hodgson2018-09-291-3/+8
* | | | | | | | | fix thinkosMatthew Hodgson2018-09-292-7/+7
* | | | | | | | | fix UTsMatthew Hodgson2018-09-282-5/+10
* | | | | | | | | untested stab at autocreating autojoin roomsMatthew Hodgson2018-09-282-0/+22
|/ / / / / / / /
* | | | | | | | Merge pull request #3794 from matrix-org/erikj/faster_typingRichard van der Hoff2018-09-271-3/+19
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typingErik Johnston2018-09-1968-689/+1415
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Improve performance of getting typing updates for replicationErik Johnston2018-09-051-3/+19
* | | | | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanupsRichard van der Hoff2018-09-272-4/+10
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | more commentsRichard van der Hoff2018-09-272-6/+3
| * | | | | | | | | Clarifications in FederationHandlerRichard van der Hoff2018-09-271-2/+11
* | | | | | | | | | Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_processAmber Brown2018-09-271-2/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Run notify_app_services as a bg processRichard van der Hoff2018-09-261-2/+6
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3970 from schnuffle/develop-py3Amber Brown2018-09-2716-17/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Replaced all occurences of e.message with str(e)Schnuffle2018-09-2716-17/+17
* | | | | | | | | | | Run our oldest supported configuration in CI (#3952)Amber Brown2018-09-271-13/+14
* | | | | | | | | | | Merge pull request #3961 from matrix-org/neilj/lock_mau_upsertsRichard van der Hoff2018-09-271-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | fix #3854Neil Johnson2018-09-261-1/+4
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2Richard van der Hoff2018-09-272-2/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Logging improvementsRichard van der Hoff2018-09-262-2/+16
| |/ / / / / / / / /
* | | | | | | | | | Include eventid in log lines when processing incoming federation transactions...Richard van der Hoff2018-09-273-45/+93
* | | | | | | | | | docstrings and unittests for storage.state (#3958)Richard van der Hoff2018-09-271-8/+22
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | fix docstring for FederationClient.get_state_for_roomRichard van der Hoff2018-09-261-4/+4
|/ / / / / / / /
* | | | | | | | Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_lenRichard van der Hoff2018-09-262-20/+24
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Log which cache is throwing exceptionsRichard van der Hoff2018-09-261-10/+17
| * | | | | | | Fix ExpiringCache.__len__ to be accurateErik Johnston2018-09-261-10/+7
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #3948 from matrix-org/rav/no_symlink_synctlAmber Brown2018-09-261-284/+0
|\ \ \ \ \ \ \
| * | | | | | | Move synctl into top dir to avoid a symlinkRichard van der Hoff2018-09-251-284/+0
* | | | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pduAmber Brown2018-09-262-24/+47
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Comments and interface cleanup for on_receive_pduRichard van der Hoff2018-09-202-24/+47
* | | | | | | | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_cachesRichard van der Hoff2018-09-2515-38/+12
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Fix some instances of ExpiringCache not expiring cache itemsErik Johnston2018-09-2115-38/+12
* | | | | | | | added "media-src: 'self'" to CSP for resources (#3578)Jérémy Farnaud2018-09-251-0/+1
* | | | | | | | Merge pull request #3925 from matrix-org/erikj/fix_producers_unregisteredRichard van der Hoff2018-09-251-14/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix spurious exceptions when client closes conncetionErik Johnston2018-09-201-14/+35
* | | | | | | | | We require attrs 16.0.0Richard van der Hoff2018-09-251-1/+3
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Only lazy load self-members on initial syncMatthew Hodgson2018-09-251-5/+8
* | | | | | | | Merge branch 'master' into developAmber Brown2018-09-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | bump versionAmber Brown2018-09-251-1/+1
* | | | | | | | | Merge branch 'master' into developAmber Brown2018-09-241-1/+1
|\| | | | | | | | | |_|/ / / / / / |/| | | | | | |
| * | | | | | | update versionAmber Brown2018-09-241-1/+1
| * | | | | | | versionAmber Brown2018-09-171-1/+1
* | | | | | | | Merge pull request #3927 from matrix-org/erikj/handle_background_errorsErik Johnston2018-09-211-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing loggerErik Johnston2018-09-201-0/+4
| * | | | | | | | Handle exceptions thrown by background tasksErik Johnston2018-09-201-0/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Always LL ourselves if we're in a room to simplify clients (#3916)Matthew Hodgson2018-09-201-0/+4
* | | | | | | | Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_linksNeil Johnson2018-09-201-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail...Richard van der Hoff2018-09-1813-39/+247
| |\ \ \ \ \ \ \
| * | | | | | | | fix link for case that config.email_riot_base_url is setNeil Johnson2018-09-131-1/+1
* | | | | | | | | Fix client IPs being broken on Python 3 (#3908)Amber Brown2018-09-202-16/+20
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #3914 from matrix-org/erikj/remove_retry_cacheErik Johnston2018-09-201-8/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix up changelog and remove spurious commentErik Johnston2018-09-191-2/+0
| * | | | | | | | pep8Erik Johnston2018-09-191-1/+0
| * | | | | | | | Remove get_destination_retry_timings cacheErik Johnston2018-09-191-5/+0
* | | | | | | | | Add a regression test for logging on failed connections (#3912)Amber Brown2018-09-201-2/+2
* | | | | | | | | Improve the logging when handling a federation transaction (#3904)Richard van der Hoff2018-09-192-56/+110
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | FixupErik Johnston2018-09-191-4/+1
* | | | | | | | Replace custom DeferredTimeoutError with defer.TimeoutErrorErik Johnston2018-09-192-12/+5
* | | | | | | | Run canceller first to allow it to generate correct errorErik Johnston2018-09-191-2/+5
* | | | | | | | Update to use new timeout function everywhere.Erik Johnston2018-09-194-72/+43
|/ / / / / / /
* | | | | | | Merge pull request #3909 from turt2live/travis/fix-logging-1Amber Brown2018-09-191-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Destination is a stringTravis Ralston2018-09-181-4/+4
* | | | | | | | Merge pull request #3907 from matrix-org/rav/set_sni_to_server_nameAmber Brown2018-09-191-3/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Set SNI to the server_name, not whatever was in the SRV recordRichard van der Hoff2018-09-181-3/+10
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeoutAmber Brown2018-09-191-1/+30
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Bump timeout on get_missing_events requestRichard van der Hoff2018-09-181-1/+30
| |/ / / / / /
* | | | | | | Use directory server for room joins (#3899)Richard van der Hoff2018-09-181-0/+5
* | | | | | | Refactor matrixfederationclient to fix logging (#3906)Richard van der Hoff2018-09-181-149/+236
* | | | | | | Merge pull request #3894 from matrix-org/hs/phone_home_py_versionAmber Brown2018-09-191-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | typoWill Hunt2018-09-171-1/+1
| * | | | | | make pip happy?Will Hunt2018-09-171-2/+4
| * | | | | | Use a string for versionsWill Hunt2018-09-171-1/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-01 12:32:23 +0000