summary refs log tree commit diff
path: root/tests (follow)
Commit message (Expand)AuthorAgeFilesLines
* refactor for readability, and reuse caching for setting tagsNeil Johnson2018-08-161-0/+1
* check for room state before deciding on actionNeil Johnson2018-08-161-20/+32
* Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-153-3/+57
|\
| * Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+mausNeil Johnson2018-08-152-2/+56
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by...Neil Johnson2018-08-153-7/+7
| | |\
| | * \ Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by...Neil Johnson2018-08-142-2/+2
| | |\ \
| | * | | fix off by 1 errorsNeil Johnson2018-08-142-3/+14
| | * | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-141-4/+4
| | * | | fix off by 1s on mauNeil Johnson2018-08-142-5/+48
| | * | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-143-5/+10
| | |\ \ \
| | * \ \ \ Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei...Neil Johnson2018-08-143-12/+84
| | |\ \ \ \
| * | | | | | speed up /members and add at= and membership params (#3568)Matthew Hodgson2018-08-151-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-1582-2362/+1984
|\| | | | |
| * | | | | update error codesNeil Johnson2018-08-151-2/+2
| * | | | | update error codes for resource limitingNeil Johnson2018-08-151-2/+2
| * | | | | replace admin_email with admin_uri for greater flexibilityNeil Johnson2018-08-152-3/+3
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_emailNeil Johnson2018-08-145-50/+258
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| | * | | fix setup_test_homeserver to be postgres compatibleNeil Johnson2018-08-141-1/+1
| | * | | in case max_mau is less than I thinkNeil Johnson2018-08-141-1/+1
| | * | | Merge pull request #3670 from matrix-org/neilj/mau_sync_blockNeil Johnson2018-08-143-12/+84
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | * | Implement a new test baseclass to cut down on boilerplate (#3684)Amber Brown2018-08-142-37/+173
| * | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-133-5/+10
| |/ /
| * | Revert "support admin_email config and pass through into blocking errors, ret...Neil Johnson2018-08-133-10/+5
| * | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-133-5/+10
| * | Run tests under PostgreSQL (#3423)Amber Brown2018-08-1344-58/+187
| * | fix up a forced long lineAmber Brown2018-08-111-1/+2
| * | Run black.black2018-08-1075-2280/+1629
| * | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-103-3/+3
| * | Merge pull request #3439 from vojeroen/send_sni_for_federation_requestsRichard van der Hoff2018-08-101-0/+2
| |\ \
| | * \ Merge branch 'develop' into send_sni_for_federation_requestsRichard van der Hoff2018-07-2723-1161/+2080
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_...Jeroen2018-07-1476-218/+279
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into send_sni_for_federation_requestsJeroen2018-07-0910-6/+731
| | |\ \ \ \
| | * | | | | send SNI for federation requestsJeroen2018-06-241-0/+2
* | | | | | | implementation of server notices to alert on hitting resource limitsNeil Johnson2018-08-101-0/+125
| |_|_|_|_|/ |/| | | | |
* | | | | | rename _user_last_seen_monthly_activeNeil Johnson2018-08-092-12/+13
* | | | | | fix importsNeil Johnson2018-08-091-1/+1
* | | | | | only block on sync where user is not part of the mau cohortNeil Johnson2018-08-091-9/+31
* | | | | | block sync if auth checks failNeil Johnson2018-08-091-6/+13
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b...Neil Johnson2018-08-092-1/+12
|\| | | | |
| * | | | | Merge pull request #3655 from matrix-org/neilj/disable_hsNeil Johnson2018-08-092-1/+12
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-081-0/+4
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-082-1/+60
| | |\ \ \ \ \ \
| | * | | | | | | disable HS from configNeil Johnson2018-08-042-1/+12
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b...Neil Johnson2018-08-0913-52/+74
|\| | | | | | | |
| * | | | | | | | Test fixes for Python 3 (#3647)Amber Brown2018-08-0913-52/+70
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #3654 from matrix-org/rav/room_versionsRichard van der Hoff2018-08-081-0/+4
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Basic support for room versioningRichard van der Hoff2018-08-031-0/+4
* | | | | | | | sync auth blockingNeil Johnson2018-08-081-0/+42
|/ / / / / / /
* | | | | | | mock config.max_mau_valueNeil Johnson2018-08-081-0/+1
* | | | | | | implement reserved users for mau limitsNeil Johnson2018-08-071-1/+58
* | | | | | | add default mau_limits_reserved_threepidsNeil Johnson2018-08-061-0/+1
| |/ / / / / |/| | | | |
* | | | | | remove unused importNeil Johnson2018-08-031-1/+1
* | | | | | bug fixesNeil Johnson2018-08-032-8/+3
* | | | | | wip commit - tests failingNeil Johnson2018-08-032-13/+13
* | | | | | fix (lots of) py3 test failuresNeil Johnson2018-08-032-1/+1
* | | | | | fix py3 test failureNeil Johnson2018-08-031-0/+1
* | | | | | fix caching and testsNeil Johnson2018-08-031-13/+37
* | | | | | do mau checks based on monthly_active_users tableNeil Johnson2018-08-023-42/+68
* | | | | | remove unused count_monthly_usersNeil Johnson2018-08-021-65/+0
* | | | | | fix test, update constructor callNeil Johnson2018-08-021-1/+1
* | | | | | insertion into monthly_active_usersNeil Johnson2018-08-021-3/+63
* | | | | | Revert "change monthly_active_users table to be a single column"Neil Johnson2018-08-021-3/+3
* | | | | | change monthly_active_users table to be a single columnNeil Johnson2018-08-011-3/+3
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-017-32/+310
|\| | | | |
| * | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limitsNeil Johnson2018-08-013-12/+184
| |\ \ \ \ \
| | * | | | | fix isortNeil Johnson2018-08-011-1/+0
| | * | | | | fix test for py3Neil Johnson2018-08-011-0/+4
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i...Neil Johnson2018-08-012-1/+101
| | |\ \ \ \ \
| | * | | | | | fix known broken testNeil Johnson2018-08-011-25/+20
| | * | | | | | make count_monthly_users async synapse/handlers/auth.pyNeil Johnson2018-08-012-21/+28
| | * | | | | | coding styleNeil Johnson2018-07-312-3/+2
| | * | | | | | fix user_ips countingNeil Johnson2018-07-311-9/+33
| | * | | | | | monthly_active_testsNeil Johnson2018-07-301-0/+48
| | * | | | | | limit register and sign in on number of monthly usersNeil Johnson2018-07-302-1/+97
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-022-19/+25
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #3384 from matrix-org/rav/rewrite_cachedlist_decoratorRichard van der Hoff2018-08-011-0/+101
| |\ \ \ \ \
| | * | | | | fix invalidationRichard van der Hoff2018-07-271-1/+41
| | * | | | | Rewrite cache list decoratorRichard van der Hoff2018-07-271-0/+61
| | |/ / / /
| * / / / / Remove pdu_failures from transactionsTravis Ralston2018-07-301-1/+0
| |/ / / /
* / / / / api into monthly_active_users tableNeil Johnson2018-07-311-0/+42
|/ / / /
* | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-251-7/+30
|\ \ \ \
| * | | | Fix unit testsRichard van der Hoff2018-07-251-7/+30
* | | | | flake8Matthew Hodgson2018-07-251-12/+12
* | | | | add tests for _get_some_state_from_cacheMatthew Hodgson2018-07-251-0/+150
* | | | | incorporate more reviewMatthew Hodgson2018-07-241-0/+9
* | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-237-87/+427
|\| | | |
| * | | | Fix unit testsErik Johnston2018-07-232-15/+40
| * | | | Make the rest of the .iterwhatever go away (#3562)Amber Brown2018-07-211-2/+1
| * | | | Test and fix support for cancellation in LinearizerRichard van der Hoff2018-07-201-0/+31
| * | | | Merge pull request #3571 from matrix-org/rav/limiter_fixesRichard van der Hoff2018-07-202-70/+47
| |\ \ \ \
| | * | | | Combine Limiter and LinearizerRichard van der Hoff2018-07-202-70/+47
| | * | | | Add a sleep to the Limiter to fix stack overflows.Richard van der Hoff2018-07-201-4/+4
| * | | | | Admin API for creating new users (#3415)Amber Brown2018-07-202-0/+308
| |/ / / /
* | | | | make test workMatthew Hodgson2018-07-191-37/+46
* | | | | first cut of a UT for testing state store (untested)Matthew Hodgson2018-07-191-0/+151
|/ / / /
* | | | Merge pull request #3556 from matrix-org/rav/background_processesRichard van der Hoff2018-07-191-52/+4
|\ \ \ \
| * | | | Make Distributor run its processes as a background processRichard van der Hoff2018-07-181-52/+4
* | | | | Move v1-only APIs into their own module & isolate deprecated ones (#3460)Amber Brown2018-07-195-86/+27
|/ / / /
* | | | Fix visibility of events from erased users over federationRichard van der Hoff2018-07-171-0/+63
* | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_serverRichard van der Hoff2018-07-171-0/+261
|\ \ \ \
| * | | | fix importsRichard van der Hoff2018-07-171-0/+1
| * | | | Add a test which profiles filter_events_for_server in a large roomRichard van der Hoff2018-07-161-2/+155
| * | | | Move filter_events_for_server out of FederationHandlerRichard van der Hoff2018-07-161-0/+107
* | | | | Refactor REST API tests to use explicit reactors (#3351)Amber Brown2018-07-1710-931/+935
* | | | | Add unit testErik Johnston2018-07-171-0/+16
* | | | | Merge pull request #3530 from matrix-org/erikj/stream_cacheAmber Brown2018-07-171-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixup unit testErik Johnston2018-07-131-3/+3
| |/ / /
* | | | Make auth & transactions more testable (#3499)Amber Brown2018-07-141-1/+4
* | | | Fix unit testsRichard van der Hoff2018-07-131-0/+1
|/ / /
* | | Use more portable syntax using attrs package.Oleg Girko2018-07-101-1/+1
* | | run isortAmber Brown2018-07-0976-216/+273
| |/ |/|
* | Merge remote-tracking branch 'hera/rav/server_acls' into developNeil Johnson2018-07-052-0/+57
|\ \
| * | Implementation of server_aclsRichard van der Hoff2018-07-042-0/+57
* | | Merge pull request #3483 from matrix-org/rav/more_server_name_validationErik Johnston2018-07-051-4/+13
|\| |
| * | More server_name validationRichard van der Hoff2018-07-041-4/+13
* | | Reinstate lost run_on_reactor in unit testRichard van der Hoff2018-07-041-2/+15
|/ /
* | Reject invalid server names (#3480)Richard van der Hoff2018-07-032-0/+46
* | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checkingErik Johnston2018-06-292-1/+247
|\ \
| * | pep8Amber Brown2018-06-271-5/+2
| * | cleanupsAmber Brown2018-06-271-1/+4
| * | stylistic cleanupAmber Brown2018-06-271-6/+18
| * | cleanupsAmber Brown2018-06-271-7/+6
| * | handle federation not telling us about prev_eventsAmber Brown2018-06-272-1/+236
* | | add testMatthew Hodgson2018-06-281-0/+33
* | | fix testsMatthew Hodgson2018-06-281-3/+15
|/ /
* / Better testing framework for homeserver-using things (#3446)Amber Brown2018-06-272-0/+309
|/
* Merge pull request #3427 from matrix-org/erikj/remove_filtersErik Johnston2018-06-221-8/+0
|\
| * remove dead filter_events_for_clientsRichard van der Hoff2018-06-121-8/+0
* | Disable partial state group caching for wildcard lookupsRichard van der Hoff2018-06-221-6/+6
* | Pass around the reactor explicitly (#3385)Amber Brown2018-06-227-21/+30
* | Merge branch 'master' into developRichard van der Hoff2018-06-142-2/+165
|\ \
| * | Fix broken unit testRichard van der Hoff2018-06-141-2/+14
| * | remove spurious debugRichard van der Hoff2018-06-141-2/+0
| * | Make default state_default 50Richard van der Hoff2018-06-141-0/+153
* | | Remove run_on_reactor (#3395)Amber Brown2018-06-142-4/+0
| |/ |/|
* | Port to sortedcontainers (with tests!) (#3332)Amber Brown2018-06-061-0/+198
|/
* Put python's logs into Trial when running unit tests (#3319)Amber Brown2018-06-041-13/+27
* fix testsRichard van der Hoff2018-05-291-0/+1
* fix another dumb typoMatthew Hodgson2018-05-291-2/+2
* fix dumb typoMatthew Hodgson2018-05-291-4/+4
* Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-224-5/+87
|\
| * Reject attempts to send event before privacy consent is givenRichard van der Hoff2018-05-221-0/+1
| * Move consent config parsing into ConsentConfigRichard van der Hoff2018-05-221-1/+1
| * Send users a server notice about consentRichard van der Hoff2018-05-222-3/+9
| * Fix logcontext leak in HttpTransactionCacheRichard van der Hoff2018-05-211-0/+21
| * Stop the transaction cache caching failuresRichard van der Hoff2018-05-211-0/+54
| * Use stream rather depth ordering for push actionsErik Johnston2018-05-111-2/+2
* | rest of the changesAmber Brown2018-05-212-192/+0
* | replacing portionsAmber Brown2018-05-211-0/+3
|/
* Merge pull request #3161 from NotAFile/remove-v1authRichard van der Hoff2018-05-034-13/+18
|\
| * Burminate v1authAdrian Tschira2018-04-304-13/+18
* | Merge pull request #3175 from matrix-org/erikj/escape_metric_valuesErik Johnston2018-05-031-1/+20
|\ \
| * | Escape label values in prometheus metricsErik Johnston2018-05-021-1/+20
* | | Merge branch 'develop' into rav/more_logcontext_leaksRichard van der Hoff2018-05-023-3/+47
|\ \ \
| * | | Fix a couple of logcontext leaks in unit testsRichard van der Hoff2018-05-022-3/+9
| |/ /
| * / Fix incorrect reference to StringIORichard van der Hoff2018-05-021-0/+38
| |/
* | Remove spurious unittest.DEBUGRichard van der Hoff2018-05-021-1/+0
* | Fix a class of logcontext leaksRichard van der Hoff2018-05-021-11/+56
|/
* Merge pull request #3108 from NotAFile/py3-six-urlparseRichard van der Hoff2018-04-302-10/+9
|\
| * Use six.moves.urlparseAdrian Tschira2018-04-152-10/+9
* | Merge branch 'develop' into rav/deferred_timeoutRichard van der Hoff2018-04-275-5/+6
|\ \
| * \ Merge pull request #3109 from NotAFile/py3-tests-fixRichard van der Hoff2018-04-235-5/+6
| |\ \
| | * | Make tests py3 compatibleAdrian Tschira2018-04-165-5/+6
| | |/
* | / Use deferred.addTimeout instead of time_bound_deferredRichard van der Hoff2018-04-231-33/+0
|/ /
* | Merge pull request #3104 from NotAFile/py3-unittest-configRichard van der Hoff2018-04-201-0/+4
|\ \
| * | Add some more variables to the unittest configAdrian Tschira2018-04-151-0/+4
| |/
* | Merge pull request #3103 from NotAFile/py3-baseexcepton-messageRichard van der Hoff2018-04-201-6/+6
|\ \
| * | Use str(e) instead of e.messageAdrian Tschira2018-04-151-6/+6
| |/
* / Avoid creating events with huge numbers of prev_eventsRichard van der Hoff2018-04-161-0/+68
|/
* Fix testsErik Johnston2018-04-111-0/+1
* Merge pull request #2996 from krombel/allow_auto_join_roomsRichard van der Hoff2018-04-101-0/+1
|\
| * move handling of auto_join_rooms to RegisterHandlerKrombel2018-03-141-0/+1
* | Merge pull request #3061 from NotAFile/add-some-byte-stringsRichard van der Hoff2018-04-091-1/+1
|\ \
| * | Add b prefixes to some strings that are bytes in py3Adrian Tschira2018-04-041-1/+1
| |/
* | Merge pull request #3016 from silkeh/improve-service-lookupsRichard van der Hoff2018-04-091-27/+2
|\ \
| * | Remove address resolution of hosts in SRV recordsSilke2018-04-041-27/+2
| |/
* / Fix overzealous cache invalidationRichard van der Hoff2018-04-051-0/+46
|/
* s/replication_client/federation_client/Erik Johnston2018-03-139-20/+20
* s/replication_server/federation_serverErik Johnston2018-03-131-1/+1
* Fix testsErik Johnston2018-03-1310-21/+22
* Fix testsErik Johnston2018-03-132-10/+8
* Fix comment typoRichard van der Hoff2018-03-051-1/+1
* Test and fix find_first_stream_ordering_after_tsRichard van der Hoff2018-03-051-0/+67
* Move RoomMemberHandler out of HandlersErik Johnston2018-03-011-1/+1
* Merge pull request #2892 from matrix-org/erikj/batch_inserts_push_actionsErik Johnston2018-02-262-5/+7
|\
| * Fix unit testsErik Johnston2018-02-202-5/+7
* | Fix testErik Johnston2018-02-201-1/+1
|/
* Fix unit testErik Johnston2018-02-151-4/+6
* Remove context.push_actionsErik Johnston2018-02-151-1/+4
* Merge pull request #2847 from matrix-org/erikj/separate_event_creationErik Johnston2018-02-062-8/+6
|\
| * s/_create_new_client_event/create_new_client_event/Erik Johnston2018-02-062-4/+4
| * Updates testsErik Johnston2018-02-052-8/+6
* | Store state groups separately from events (#2784)Erik Johnston2018-02-062-69/+89
* | Merge pull request #2844 from matrix-org/rav/evicted_metricsRichard van der Hoff2018-02-051-0/+12
|\ \ | |/ |/|
| * report metrics on number of cache evictionsRichard van der Hoff2018-02-051-0/+12
* | Fix broken unit test for media storageErik Johnston2018-02-051-1/+6
* | Merge pull request #2791 from matrix-org/erikj/media_storage_refactorErik Johnston2018-02-053-0/+109
|\ \
| * | Add unit testsErik Johnston2018-01-183-0/+109
* | | Factor out resolve_state_groups to a separate handlerRichard van der Hoff2018-02-011-1/+3
| |/ |/|
* | Add tests for user directory searchRichard van der Hoff2018-01-272-0/+89
* | Make it possible to run tests against postgresRichard van der Hoff2018-01-271-9/+34
* | Create dbpool as normal in testsRichard van der Hoff2018-01-272-45/+19
* | Run on_new_connection for unit testsRichard van der Hoff2018-01-271-7/+17
* | Remove unused/bitrotted MemoryDataStoreRichard van der Hoff2018-01-261-151/+13
* | Remove spurious unittest.DEBUGRichard van der Hoff2018-01-261-1/+0
* | Merge pull request #2821 from matrix-org/rav/matthew_test_fixesRichard van der Hoff2018-01-221-2/+6
|\ \
| * | Matthew's fixes to the unit testsRichard van der Hoff2018-01-221-2/+6
* | | Add federation_domain_whitelist option (#2820)Matthew Hodgson2018-01-221-0/+1
|/ /
* | Merge pull request #2813 from matrix-org/matthew/registrations_require_3pidMatthew Hodgson2018-01-221-0/+1
|\ \
| * | mock registrations_require_3pidMatthew Hodgson2018-01-191-0/+1
* | | Merge pull request #2804 from matrix-org/erikj/file_consumerErik Johnston2018-01-181-0/+176
|\ \ \ | |/ / |/| / | |/
| * Move test stuff to testsErik Johnston2018-01-181-8/+46
| * Add decent impl of a FileConsumerErik Johnston2018-01-171-0/+138
* | Optimise LoggingContext creation and copyingRichard van der Hoff2018-01-162-15/+15
|/
* Merge pull request #2765 from matrix-org/rav/fix_room_utsRichard van der Hoff2018-01-093-4/+9
|\
| * enable twisted delayedcall debugging in UTsRichard van der Hoff2018-01-091-1/+5
| * Remove dead codeRichard van der Hoff2018-01-091-3/+0
| * Disable user_directory updates for UTsRichard van der Hoff2018-01-091-0/+4
* | Fix broken config UTsRichard van der Hoff2018-01-091-1/+16
|/
* Merge pull request #2723 from matrix-org/matthew/search-all-local-usersMatthew Hodgson2017-12-051-1/+13
|\
| * try make tests work a bit more...Matthew Hodgson2017-12-041-0/+12
| * erik told me toMatthew Hodgson2017-12-041-1/+1
* | Refactor UI auth implementationRichard van der Hoff2017-12-051-4/+7
|/
* Add extra space before inline commentLuke Barnard2017-11-161-1/+1
* Fix testsLuke Barnard2017-11-161-0/+1
* Fix tests for Store.__init__ updateRichard van der Hoff2017-11-135-11/+11
* Fix appservice tests to account for new behavior of notify_interested_servicesIlya Zhuravlev2017-11-021-3/+12
* Fix tests for refresh_token removalRichard van der Hoff2017-11-011-3/+3
* fix testsRichard van der Hoff2017-10-311-0/+1
* replace 'except:' with 'except Exception:'Richard van der Hoff2017-10-232-5/+5
* Validate group ids when parsingRichard van der Hoff2017-10-211-1/+23
* Merge pull request #2546 from matrix-org/rav/remove_dead_event_injectorRichard van der Hoff2017-10-171-76/+0
|\
| * Remove dead classRichard van der Hoff2017-10-171-76/+0
* | Merge pull request #2547 from matrix-org/rav/test_make_deferred_yieldableRichard van der Hoff2017-10-171-0/+38
|\ \
| * | Fix name of test_logcontextRichard van der Hoff2017-10-171-0/+0
| * | Add some tests for make_deferred_yieldableRichard van der Hoff2017-10-171-0/+38
| |/
* / Fix testDavid Baker2017-10-171-0/+1
|/
* Merge pull request #2532 from matrix-org/rav/fix_linearizerRichard van der Hoff2017-10-111-4/+24
|\
| * Fix stackoverflow and logcontexts from linearizerRichard van der Hoff2017-10-111-4/+24
* | Merge branch 'develop' into erikj/groups_mergedDavid Baker2017-10-023-13/+187
|\|
| * Do an AAAA lookup on SRV record targets (#2462)Richard van der Hoff2017-09-221-4/+22
| * Add some more tests for KeyringRichard van der Hoff2017-09-201-37/+140
| * Fix concurrent server_key requests (#2458)Richard van der Hoff2017-09-191-3/+55
| * Add a config option to block all room invites (#2457)Richard van der Hoff2017-09-191-0/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_mergedErik Johnston2017-09-191-0/+74
|\|
| * Clean up and document handling of logcontexts in Keyring (#2452)Richard van der Hoff2017-09-181-0/+74
* | Split out profile handler to fix testsErik Johnston2017-08-253-7/+5
* | Add groups to sync streamErik Johnston2017-07-201-2/+2
|/
* Merge pull request #2309 from matrix-org/erikj/user_ip_replErik Johnston2017-07-062-6/+2
|\
| * Fix upErik Johnston2017-06-272-6/+2
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-28 19:40:53 +0000