summary refs log tree commit diff
path: root/tests (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add basic editing supportErik Johnston2019-05-161-9/+82
* Check that event is visible in new APIsErik Johnston2019-05-161-1/+1
* Add aggregations APIErik Johnston2019-05-161-3/+248
* Add simple pagination APIErik Johnston2019-05-151-0/+30
* Add simple send_relation API and track in DBErik Johnston2019-05-151-0/+98
* Merge branch 'erikj/fix_config_ratelimiting' into erikj/testErik Johnston2019-05-141-1/+2
|\
| * Use correct config option for ratelimiting in testsErik Johnston2019-05-141-1/+2
* | Expose DataStore._get_events as get_events_as_listErik Johnston2019-05-141-1/+1
|/
* Migrate all tests to use the dict-based config format instead of hanging item...Amber Brown2019-05-1321-203/+238
* Add ability to blacklist ip ranges for federation traffic (#5043)Andrew Morgan2019-05-131-0/+71
* URL preview blacklisting fixes (#5155)Andrew Morgan2019-05-101-11/+11
* Run Black on the tests again (#5170)Amber Brown2019-05-1053-1169/+828
* Fix bogus imports in tests (#5154)Brendan Abolivier2019-05-083-5/+6
* add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-082-1/+123
* Do checks on aliases for incoming m.room.aliases events (#5128)Brendan Abolivier2019-05-081-0/+169
* Remove the requirement to authenticate for /admin/server_version. (#5122)Richard van der Hoff2019-05-072-26/+26
* Add admin api for sending server_notices (#5121)Richard van der Hoff2019-05-0215-20/+23
* Move admin api impl to its own packageRichard van der Hoff2019-05-0116-37/+63
* Config option for verifying federation certificates (MSC 1711) (#4967)Andrew Morgan2019-04-251-1/+2
* Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-1723-327/+928
|\
| * Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-171-1/+99
| |\
| * | Remove periods from copyright headers (#5046)Andrew Morgan2019-04-112-2/+2
| * | Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-092-3/+52
| |\ \
| * | | Rewrite Datastore.get_server_verify_keysRichard van der Hoff2019-04-091-3/+50
| * | | Rewrite test_keys as a HomeserverTestCaseRichard van der Hoff2019-04-081-19/+15
| * | | Fix from_server buglet in get_keys_from_perspectivesRichard van der Hoff2019-04-081-0/+1
| * | | Merge pull request #5001 from matrix-org/rav/keyring_cleanupsRichard van der Hoff2019-04-081-0/+130
| |\ \ \
| | * | | test for get_keys_from_perspectivesRichard van der Hoff2019-04-041-0/+67
| | * | | add a test for get_keys_from_serverRichard van der Hoff2019-04-041-0/+63
| * | | | Add config option to block users from looking up 3PIDs (#5010)Brendan Abolivier2019-04-042-1/+66
| * | | | Add unit test for deleting groupsErik Johnston2019-04-031-0/+124
| * | | | Fix grammar and document get_current_users_in_room (#4998)Andrew Morgan2019-04-031-2/+2
| |/ / /
| * | | Rewrite KeyringTestCase as a HomeServerTestCase (#4986)Richard van der Hoff2019-04-031-107/+104
| * | | Remove presence lists (#4989)Neil Johnson2019-04-031-118/+0
| * | | Fix sync bug when accepting invites (#4956)Richard van der Hoff2019-04-023-49/+196
| * | | Neilj/fix threepid auth check (with tests) (#4474)Neil Johnson2019-04-011-0/+32
| * | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-019-26/+32
| * | | Merge pull request #4942 from matrix-org/erikj/fix_presenceErik Johnston2019-03-281-1/+175
| |\ \ \
| | * | | Review commentsErik Johnston2019-03-281-5/+9
| | * | | Add unit testsErik Johnston2019-03-271-1/+171
| * | | | Move replication.tcp.streams into a packageRichard van der Hoff2019-03-271-1/+1
| |/ / /
* | | / Add management endpoints for account validityBrendan Abolivier2019-04-171-8/+87
| |_|/ |/| |
* | | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-171-1/+99
| |/ |/|
* | Add account expiration featureBrendan Abolivier2019-04-092-3/+52
|/
* Make federation endpoints more tolerant of trailing slashes v2 (#4935)Andrew Morgan2019-03-261-3/+3
* Fix bug where read-receipts lost their timestamps (#4927)Richard van der Hoff2019-03-254-0/+148
* Use an explicit dbname for postgres connections in the tests. (#4928)Richard van der Hoff2019-03-251-18/+16
* Merge pull request #4869 from matrix-org/erikj/yaml_loadErik Johnston2019-03-222-3/+3
|\
| * Use yaml safe_loadErik Johnston2019-03-222-3/+3
* | Some more porting to HomeserverTestCase and remove old RESTHelper (#4913)Amber Brown2019-03-224-230/+123
* | Remove trailing slashes from outbound federation requests and retry on 400 (#...Andrew Morgan2019-03-212-0/+101
|\ \ | |/ |/|
| * lintAndrew Morgan2019-03-201-1/+1
| * New test, fix issuesAndrew Morgan2019-03-201-0/+45
| * Fix comments. v0.99.2 -> v0.99.3Andrew Morgan2019-03-201-1/+1
| * Federation test fixed!Andrew Morgan2019-03-201-2/+5
| * Better exception handlingAndrew Morgan2019-03-181-4/+1
| * Correct var nameAndrew Morgan2019-03-131-0/+54
| * i should have given up x3Andrew Morgan2019-03-131-39/+0
| * i should have given up x2Andrew Morgan2019-03-131-0/+39
| * Switch to wrapper function around _send_requestAndrew Morgan2019-03-131-2/+2
| * Correct argument nameAndrew Morgan2019-03-121-2/+2
| * Cleaner way of implementing trailing slashesAndrew Morgan2019-03-121-2/+4
| * and againAndrew Morgan2019-03-111-1/+1
| * Fix syntax errorAndrew Morgan2019-03-111-1/+1
| * We're calling different functions nowAndrew Morgan2019-03-111-2/+2
* | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_roomsErik Johnston2019-03-211-1/+65
|\ \
| * | isortErik Johnston2019-03-211-1/+1
| * | Deny peeking into rooms that have been blockedErik Johnston2019-03-211-1/+65
* | | Merge pull request #4904 from matrix-org/erikj/fix_shutdownErik Johnston2019-03-211-1/+74
|\ \ \
| * | | Fix typo and add descriptionErik Johnston2019-03-211-1/+5
| |/ /
| * | Rejig testcase to make it more extensibleErik Johnston2019-03-211-17/+22
| * | Remove debugErik Johnston2019-03-211-1/+0
| * | Add testsErik Johnston2019-03-211-1/+66
* | | Merge pull request #4896 from matrix-org/erikj/disable_room_directoryErik Johnston2019-03-212-3/+58
|\ \ \
| * | | Add testErik Johnston2019-03-202-3/+58
* | | | Log requests which are simulated by the unit tests. (#4905)Richard van der Hoff2019-03-201-8/+1
* | | | Merge pull request #4895 from matrix-org/erikj/disable_user_searchErik Johnston2019-03-201-0/+52
|\ \ \ \ | |_|/ / |/| | |
| * | | Add testErik Johnston2019-03-201-0/+52
| |/ /
* / / Batch up outgoing read-receipts to reduce federation traffic. (#4890)Richard van der Hoff2019-03-201-0/+128
|/ /
* | Fix RegistrationTestCaseRichard van der Hoff2019-03-191-2/+9
* | Use a regular HomeServerConfig object for unit testsRichard van der Hoff2019-03-191-11/+15
* | Fix resource limits testsRichard van der Hoff2019-03-191-2/+5
* | Fix registration testRichard van der Hoff2019-03-191-1/+2
* | Fix email testRichard van der Hoff2019-03-191-0/+2
* | Merge remote-tracking branch 'origin/develop' into HEADRichard van der Hoff2019-03-191-2/+22
|\ \
| * | fix test_auto_create_auto_join_where_no_consent (#4886)Neil Johnson2019-03-191-2/+22
* | | Enforce hs_disabled_message correctlyRichard van der Hoff2019-03-191-0/+17
|/ /
* | Migrate the user directory initial population to a background task (#4864)Amber Brown2019-03-193-45/+79
* | Add ratelimiting on failed login attempts (#4865)Brendan Abolivier2019-03-182-0/+47
* | Add ratelimiting on login (#4821)Brendan Abolivier2019-03-153-4/+128
* | Revert "Make federation endpoints more tolerant of trailing slashes for some ...Erik Johnston2019-03-141-3/+3
* | Merge pull request #4846 from matrix-org/hawkowl/userdir-searchErik Johnston2019-03-143-15/+22
|\ \ | |/ |/|
| * fixupAmber Brown2019-03-131-20/+1
| * fixupAmber Brown2019-03-121-2/+2
| * fixupAmber Brown2019-03-121-16/+20
| * fixesAmber Brown2019-03-121-4/+12
| * setup masterAmber Brown2019-03-111-0/+2
| * Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-searchAmber Brown2019-03-111-0/+1
| |\
| * | initialAmber Brown2019-03-111-0/+12
* | | Make federation endpoints more tolerant of trailing slashes for some endpoint...Andrew Morgan2019-03-111-3/+3
| |/ |/|
* | Disable captcha registration by default in testsAndrew Morgan2019-03-081-0/+1
|/
* Rewrite userdir to be faster (#4537)Amber Brown2019-03-072-43/+225
* Merge pull request #4772 from jbweston/jbweston/server-version-apiErik Johnston2019-03-051-2/+36
|\
| * Add 'server_version' endpoint to admin APIJoseph Weston2019-03-011-1/+35
| * Import 'admin' module rather than 'register_servlets' directlyJoseph Weston2019-03-011-2/+2
* | Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-059-23/+72
* | Update test_typing to use HomeserverTestCase. (#4771)Richard van der Hoff2019-03-044-179/+175
|/
* Fix parsing of Content-Disposition headers (#4763)Richard van der Hoff2019-02-271-0/+45
* Move from TravisCI to BuildKite (#4752)Amber Brown2019-02-271-10/+34
* Fix unit testsErik Johnston2019-02-271-0/+6
* UPSERT many functionality (#4644)Amber Brown2019-02-201-0/+88
* Fix registration on workers (#4682)Erik Johnston2019-02-201-1/+1
* Move register_device into handlerErik Johnston2019-02-181-70/+23
* Fix unit testsErik Johnston2019-02-181-6/+15
* Clarify and fix behaviour when there are multiple aliasesErik Johnston2019-02-141-0/+6
* Add configurable room list publishing rulesErik Johnston2019-02-142-0/+74
* Fix error when loading cert if tls is disabled (#4618)Richard van der Hoff2019-02-121-1/+1
* fix testsRichard van der Hoff2019-02-111-2/+6
* Move ClientTLSOptionsFactory init out of refresh_certificates (#4611)Richard van der Hoff2019-02-111-3/+1
* Merge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updatingErik Johnston2019-02-111-0/+72
|\
| * make sure version is in body and wrap in linearizer queueHubert Chathi2019-02-081-0/+72
* | Merge pull request #4420 from matrix-org/jaywink/openid-listenerErik Johnston2019-02-112-1/+120
|\ \ | |/ |/|
| * Fix flake8 issuesJason Robinson2019-01-231-2/+8
| * Fix openid tests after rebaseJason Robinson2019-01-231-2/+2
| * Fix sorting of imports in tests. Remove an unnecessary mockJason Robinson2019-01-231-2/+2
| * Add tests for the openid lister for SynapseHomeServerJason Robinson2019-01-231-1/+48
| * Add tests for the openid lister for FederationReaderServerJason Robinson2019-01-231-0/+66
| * Fix a test docstring in frontend proxy testsJason Robinson2019-01-231-1/+1
* | Treat an invalid .well-known the same as an absent oneRichard van der Hoff2019-02-011-11/+70
* | Update federation routing logic to check .well-known before SRVRichard van der Hoff2019-01-311-30/+21
* | Merge pull request #4472 from matrix-org/neilj/room_capabilitiesErik Johnston2019-01-301-0/+78
|\ \
| * \ Merge branch 'develop' into neilj/room_capabilitiesNeil Johnson2019-01-3020-120/+766
| |\ \
| * | | rework format of change password capabilityNeil Johnson2019-01-291-2/+2
| * | | support change_password in capabilities end-pointNeil Johnson2019-01-291-0/+23
| * | | isortNeil Johnson2019-01-291-1/+2
| * | | enforce auth for capabilities endpointNeil Johnson2019-01-291-4/+19
| * | | Support room version capabilities in CS API (MSC1804)Neil Johnson2019-01-251-0/+39
* | | | Follow redirects on .well-known (#4520)Richard van der Hoff2019-01-301-0/+97
* | | | Add a caching layer to .well-known responses (#4516)Richard van der Hoff2019-01-303-8/+243
* | | | Fix flake8 (#4519)Amber Brown2019-01-304-10/+1
| |/ / |/| |
* | | Relax requirement for a content-type on .well-known (#4511)Richard van der Hoff2019-01-291-1/+0
* | | Do not generate self-signed TLS certificates by default. (#4509)Amber Brown2019-01-292-2/+75
* | | Merge pull request #4481 from matrix-org/erikj/event_builderErik Johnston2019-01-292-31/+27
|\ \ \
| * | | Fix test to use valid event formatErik Johnston2019-01-291-1/+1
| * | | Make add_hashes_and_signatures operate on dictsErik Johnston2019-01-291-30/+26
* | | | Implement MSC1708 (.well-known lookups for server routing) (#4489)Richard van der Hoff2019-01-294-9/+350
* | | | Enable configuring test log level via env var (#4506)Richard van der Hoff2019-01-293-30/+79
|/ / /
* | | Use SimpleResolverComplexifier in tests (#4497)Richard van der Hoff2019-01-292-32/+16
* | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_versionErik Johnston2019-01-282-3/+14
|\ \ \
| * | | Pass through room version to event authErik Johnston2019-01-252-3/+14
* | | | Fix UPSERTs on SQLite 3.24+ (#4477)Amber Brown2019-01-282-4/+7
* | | | Handle IP literals explicitlyRichard van der Hoff2019-01-281-17/+2
* | | | Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487)Richard van der Hoff2019-01-281-1/+180
|/ / /
* | | Merge pull request #4470 from matrix-org/erikj/require_format_versionErik Johnston2019-01-255-4/+14
|\ \ \
| * | | Fix testsErik Johnston2019-01-255-4/+14
* | | | Fix Host header sent by MatrixFederationAgent (#4468)Richard van der Hoff2019-01-252-1/+17
|/ / /
* | | Revert "Require event format version to parse or create events"Erik Johnston2019-01-255-14/+4
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/require_fo...Erik Johnston2019-01-245-14/+163
|\| |
| * | Look up the right SRV recordRichard van der Hoff2019-01-241-3/+9
| * | lots more tests for MatrixFederationAgentRichard van der Hoff2019-01-241-10/+79
| * | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_checkNeil Johnson2019-01-241-1/+3
| |\ \
| | * | Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-221-1/+3
| | |/
| * | Use native UPSERTs where possible (#4306)Amber Brown2019-01-243-5/+20
| * | Don't send IP addresses as SNI (#4452)Richard van der Hoff2019-01-241-3/+60
* | | Fix testsErik Johnston2019-01-245-4/+14
|/ /
* | fix python2 test failureRichard van der Hoff2019-01-231-1/+1
* | Add a test for MatrixFederationAgentRichard van der Hoff2019-01-222-1/+195
* | put resolve_service in an objectRichard van der Hoff2019-01-221-20/+18
* | Require that service_name be a byte stringRichard van der Hoff2019-01-221-4/+4
* | Make MatrixFederationClient use MatrixFederationAgentRichard van der Hoff2019-01-221-0/+96
|/
* Refactor and bugfix for resove_service (#4427)Richard van der Hoff2019-01-222-14/+108
* Require ECDH key exchange & remove dh_params (#4429)Amber Brown2019-01-221-1/+0
* Remove redundant WrappedConnection (#4409)Richard van der Hoff2019-01-181-7/+47
* Fix incorrect logcontexts after a Deferred was cancelled (#4407)Richard van der Hoff2019-01-171-0/+104
* Merge remote-tracking branch 'origin/master' into developAmber Brown2019-01-111-154/+1
|\
| * Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1Richard van der Hoff2019-01-101-154/+1
| |\
| | * Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34Richard van der Hoff2019-01-101-154/+1
| | |\
| | | * Skip macaroon check for access tokens in the dbRichard van der Hoff2019-01-101-148/+1
* | | | Fix adding new rows instead of updating them if one of the key values is a NU...Amber Brown2019-01-091-0/+71
|/ / /
* | | Refactor request sending to have better excpetions (#4358)Erik Johnston2019-01-081-3/+10
* | | Remove v1 only REST APIs now we don't ship matrix console (#4334)Amber Brown2018-12-292-145/+44
* | | Return well_known in /login response (#4319)Richard van der Hoff2018-12-241-0/+3
* | | Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5Richard van der Hoff2018-12-231-1/+23
|\ \ \
| * | | Fix test_metrics.py compatibility prometheus_client 0.5Maarten de Vries2018-12-211-1/+23
* | | | Fix IP URL previews on Python 3 (#4215)Amber Brown2018-12-222-98/+334
|/ / /
* | | create support user (#4141)Neil Johnson2018-12-148-10/+204
* | | Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-071-1/+1
* | | Implement SAML2 authentication (#4267)Richard van der Hoff2018-12-071-0/+1
* | | Factor SSO success handling out of CAS login (#4264)Richard van der Hoff2018-12-071-1/+30
* | | Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-061-15/+0
* | | Implement .well-known handling (#4262)Richard van der Hoff2018-12-051-0/+58
|/ /
* | Patch defer.inlineCallbacks to check logcontexts in tests (#4205)Richard van der Hoff2018-12-043-3/+98
* | Neilj/fix autojoin (#4223)Neil Johnson2018-11-281-1/+11
* | Check logcontexts before and after each test (#4190)Richard van der Hoff2018-11-272-8/+21
* | Fix more logcontext leaks in tests (#4209)Richard van der Hoff2018-11-271-1/+2
* | Do a GC after each test to fix logcontext leaks (#4227)Richard van der Hoff2018-11-271-2/+13
* | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixesRichard van der Hoff2018-11-204-5/+8
|\ \
| * | Fix logcontext leak in test_url_previewRichard van der Hoff2018-11-191-1/+2
| * | Fix logcontext leak in http pusher testRichard van der Hoff2018-11-191-1/+2
| * | Fix some tests which leaked logcontextsRichard van der Hoff2018-11-192-3/+4
* | | Fix fallback auth on Python 3 (#4197)Amber Brown2018-11-191-0/+104
|/ /
* | Fix the terms UI auth testsTravis Ralston2018-11-151-1/+1
* | Fix Content-Disposition in media repository (#4176)Amber Brown2018-11-152-0/+160
* | Add option to track MAU stats (but not limit people) (#3830)Travis Ralston2018-11-153-0/+44
* | Use <meta> tags to discover the per-page encoding of html previews (#4183)Amber Brown2018-11-151-0/+77
* | Add a test for the public T&Cs formRichard van der Hoff2018-11-141-0/+7
* | Add test to assert set_e2e_device_keys correctly returns False on no-opErik Johnston2018-11-081-0/+15
* | Fix URL preview bugs (type error when loading cache from db, content-type inc...Amber Brown2018-11-082-0/+166
* | Remove some boilerplate in tests (#4156)Amber Brown2018-11-0710-216/+161
* | Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-062-2/+5
* | handle empty backups according to latest spec proposal (#4123)Hubert Chathi2018-11-051-42/+37
* | Tests for user consent resource (#4140)Amber Brown2018-11-063-5/+138
* | Add some tests for the HTTP pusher (#4149)Amber Brown2018-11-061-0/+159
* | Add helpers for getting prev and auth events (#4139)Erik Johnston2018-11-061-1/+1
* | Merge pull request #4137 from matrix-org/erikj/clean_up_eventsErik Johnston2018-11-022-3/+3
|\ \
| * | Clean up event accesses and testsErik Johnston2018-11-022-3/+3
* | | Fix typing being reset causing infinite syncs (#4127)Amber Brown2018-11-032-1/+130
* | | Merge pull request #4135 from matrix-org/erikj/fix_state_res_noneErik Johnston2018-11-021-2/+98
|\ \ \
| * | | Fix None exception in state res v2Erik Johnston2018-11-021-2/+98
| |/ /
* | | The tests also need a version parameter Travis Ralston2018-10-311-1/+1
* | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-3115-99/+716
|\| |
| * | Fix search 500ing (#4122)Amber Brown2018-10-311-1/+105
| * | Write some tests for the email pusher (#4095)Amber Brown2018-10-305-3/+160
| * | Merge pull request #4091 from matrix-org/rav/room_version_upgradesRichard van der Hoff2018-10-291-9/+1
| |\ \
| | * | fix broken testRichard van der Hoff2018-10-251-9/+1
| * | | Port register_new_matrix_user to Python 3 and add tests (#4085)Amber Brown2018-10-262-0/+160
| |/ /
| * | Refactor state group lookup to reduce DB hits (#4011)Erik Johnston2018-10-251-65/+110
| * | Merge pull request #4051 from matrix-org/erikj/alias_disallow_listErik Johnston2018-10-252-0/+115
| |\ \
| | * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa...Erik Johnston2018-10-257-23/+734
| | |\ \
| | * | | Use allow/denyErik Johnston2018-10-252-5/+5
| | * | | Add tests for alias creation rulesErik Johnston2018-10-191-0/+48
| | * | | Add tests for config generationErik Johnston2018-10-191-0/+67
| * | | | Merge pull request #4081 from matrix-org/neilj/fix_mau_initNeil Johnson2018-10-251-2/+8
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | fix style inconsistenciesNeil Johnson2018-10-241-2/+2
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_initNeil Johnson2018-10-245-4/+677
| | |\ \ \
| | * | | | fix race condiftion in calling initialise_reserved_usersNeil Johnson2018-10-231-2/+8
| | | |/ / | | |/| |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea...Neil Johnson2018-10-257-4/+1113
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | improve auto room join logic, comments and testsNeil Johnson2018-10-121-4/+17
| * | | | Merge branch 'develop' into matthew/autocreate_autojoinNeil Johnson2018-10-047-205/+292
| |\ \ \ \
| * | | | | move logic into register, fix room alias localpart bug, testsNeil Johnson2018-10-042-19/+44
* | | | | | pep8Travis Ralston2018-10-242-6/+3
* | | | | | It helps to import thingsTravis Ralston2018-10-241-0/+16
* | | | | | Move test to where the other integration tests areTravis Ralston2018-10-242-97/+109
* | | | | | Fix testTravis Ralston2018-10-241-25/+50
* | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-245-4/+677
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_valid...Richard van der Hoff2018-10-244-3/+666
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #4082 from matrix-org/rav/fix_pep8Richard van der Hoff2018-10-242-3/+3
| | |\ \ \ \ \
| | | * | | | | Fix a number of flake8 errorsRichard van der Hoff2018-10-242-3/+3
| | | | |_|/ / | | | |/| | |
| | * | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebaseErik Johnston2018-10-242-0/+663
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | isortErik Johnston2018-10-241-4/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-23 12:05:47 +0000