summary refs log tree commit diff
path: root/tests (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | Implement RedirectException (#6687)Andrew Morgan2020-03-231-2/+77
|\| |
| * | Implement RedirectException (#6687)Richard van der Hoff2020-01-151-2/+77
* | | Add `local_current_membership` table (#6655)Andrew Morgan2020-03-235-17/+14
|\| |
| * | Add `local_current_membership` table (#6655)Erik Johnston2020-01-155-17/+14
* | | Quarantine media by ID or user ID (#6681)Andrew Morgan2020-03-232-0/+378
|\| |
| * | Quarantine media by ID or user ID (#6681)Andrew Morgan2020-01-132-0/+378
* | | Kill off RegistrationError (#6691)Andrew Morgan2020-03-231-2/+0
|\| |
| * | Kill off RegistrationError (#6691)Richard van der Hoff2020-01-131-2/+0
* | | Allow admin users to create or modify users without a shared secret (#6495)Andrew Morgan2020-03-233-338/+467
|\| |
| * | Allow admin users to create or modify users without a shared secret (#6495)Manuel Stahl2020-01-093-338/+467
* | | Fix GET request on /_synapse/admin/v2/users endpoint (#6563)Andrew Morgan2020-03-201-0/+41
|\| |
| * | Fix GET request on /_synapse/admin/v2/users endpoint (#6563)Manuel Stahl2020-01-081-0/+41
* | | Back out ill-advised notary server hackery (#6657)Andrew Morgan2020-03-203-4/+131
|\| |
| * | Back out ill-advised notary server hackery (#6657)Richard van der Hoff2020-01-083-4/+131
* | | port BackgroundUpdateTestCase to HomeserverTestCase (#6653)Andrew Morgan2020-03-201-35/+37
|\| |
| * | port BackgroundUpdateTestCase to HomeserverTestCase (#6653)Richard van der Hoff2020-01-071-35/+37
* | | Merge pull request #6629 from matrix-org/rav/kill_event_reference_hashesAndrew Morgan2020-03-202-16/+5
|\| |
| * | Merge pull request #6629 from matrix-org/rav/kill_event_reference_hashesRichard van der Hoff2020-01-062-16/+5
| |\ \
| | * | Remove unused get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-061-13/+6
| | * | Remove unused hashes and depths from create_event paramsRichard van der Hoff2020-01-061-5/+1
| | * | rename get_prev_events_for_room to get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-061-2/+2
* | | | Fix exception when fetching notary server's old keys (#6625)Andrew Morgan2020-03-201-44/+95
|\| | |
| * | | Fix exception when fetching notary server's old keys (#6625)Richard van der Hoff2020-01-061-44/+95
* | | | Workaround for error when fetching notary's own key (#6620)Andrew Morgan2020-03-202-1/+140
|\| | |
| * | | Workaround for error when fetching notary's own key (#6620)Richard van der Hoff2020-01-062-1/+140
| |/ /
* | | Kill off redundant SynapseRequestFactory (#6619)Andrew Morgan2020-03-201-2/+4
|\| |
| * | Kill off redundant SynapseRequestFactory (#6619)Richard van der Hoff2020-01-031-2/+4
* | | Split state groups into a separate data store (#6296)Andrew Morgan2020-03-202-2/+2
|\| |
| * | Split state groups into a separate data store (#6296)Erik Johnston2019-12-202-2/+2
* | | Change EventContext to use the Storage class (#6564)Andrew Morgan2020-03-201-14/+14
|\| |
| * | Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-201-14/+14
* | | Clean up startup for the pusher (#6558)Andrew Morgan2020-03-202-0/+7
|\| |
| * | Clean up startup for the pusher (#6558)Richard van der Hoff2019-12-182-0/+7
* | | Add database config class (#6513)Andrew Morgan2020-03-207-95/+100
|\| |
| * | Add database config class (#6513)Erik Johnston2019-12-187-95/+100
| * | Merge release-v1.7.1 into developRichard van der Hoff2019-12-181-0/+127
| |\ \
* | \ \ Merge pull request #6553 from matrix-org/babolivier/fix-context-filterAndrew Morgan2020-03-191-0/+127
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #6553 from matrix-org/babolivier/fix-context-filterBrendan Abolivier2019-12-161-0/+127
| |\ \ \
| | * | | Incorporate reviewBrendan Abolivier2019-12-161-5/+0
| | * | | LintBrendan Abolivier2019-12-161-2/+1
| | * | | Add test caseBrendan Abolivier2019-12-161-0/+133
| * | | | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-161-0/+3
| |/ / /
* | | | Add option to allow profile queries without sharing a room (#6523)Andrew Morgan2020-03-191-1/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Add option to allow profile queries without sharing a room (#6523)Will Hunt2019-12-161-0/+2
* | | | sanity-checking for events used in state res (#6531)Andrew Morgan2020-03-191-0/+3
|\| | |
| * | | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-131-0/+3
* | | | look up cross-signing keys from the DB in bulk (#6486)Andrew Morgan2020-03-191-8/+0
|\| | |
| * | | look up cross-signing keys from the DB in bulk (#6486)Hubert Chathi2019-12-121-8/+0
* | | | Merge pull request #6511 from matrix-org/erikj/remove_db_config_from_appsAndrew Morgan2020-03-192-13/+8
|\| | |
| * | | Merge pull request #6511 from matrix-org/erikj/remove_db_config_from_appsErik Johnston2019-12-122-13/+8
| |\ \ \
| | * | | Remove database config parsing from apps.Erik Johnston2019-12-102-13/+8
| | |/ /
* | | | Merge pull request #6517 from matrix-org/rav/event_auth/13Andrew Morgan2020-03-191-5/+9
|\| | |
| * | | Merge pull request #6517 from matrix-org/rav/event_auth/13Richard van der Hoff2019-12-111-5/+9
| |\ \ \
| | * | | convert to async: FederationHandler.on_receive_pduRichard van der Hoff2019-12-111-5/+9
* | | | | Merge pull request #6504 from matrix-org/erikj/account_validity_async_awaitAndrew Morgan2020-03-191-2/+1
|\| | | |
| * | | | Merge pull request #6504 from matrix-org/erikj/account_validity_async_awaitErik Johnston2019-12-111-2/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Port handlers.account_validity to async/await.Erik Johnston2019-12-101-2/+1
| | |/ /
* | | | Fix race which caused deleted devices to reappear (#6514)Andrew Morgan2020-03-191-20/+29
|\| | |
| * | | Fix race which caused deleted devices to reappear (#6514)Richard van der Hoff2019-12-101-20/+29
* | | | Merge pull request #6505 from matrix-org/erikj/make_deferred_yiedableAndrew Morgan2020-03-191-0/+24
|\| | |
| * | | Merge pull request #6505 from matrix-org/erikj/make_deferred_yiedableErik Johnston2019-12-101-0/+24
| |\ \ \
| | * | | Fix make_deferred_yieldable to work with coroutinesErik Johnston2019-12-101-0/+24
| | |/ /
* | | | Merge pull request #6506 from matrix-org/erikj/remove_snapshot_cacheAndrew Morgan2020-03-191-63/+0
|\| | |
| * | | Merge pull request #6506 from matrix-org/erikj/remove_snapshot_cacheErik Johnston2019-12-101-63/+0
| |\ \ \ | | |/ / | |/| |
| | * | Remove SnapshotCache in favour of ResponseCacheErik Johnston2019-12-091-63/+0
* | | | Back out perf regression from get_cross_signing_keys_from_cache. (#6494)Andrew Morgan2020-03-197-25/+31
|\| | |
| * | | Back out perf regression from get_cross_signing_keys_from_cache. (#6494)Neil Johnson2019-12-091-0/+8
| * | | Merge pull request #6487 from matrix-org/erikj/pass_in_dbErik Johnston2019-12-096-25/+23
| |\ \ \ | | |/ / | |/| |
| | * | Fixup testsErik Johnston2019-12-066-23/+20
| | * | Change DataStores to accept 'database' param.Erik Johnston2019-12-061-2/+3
* | | | Merge pull request #6484 from matrix-org/erikj/port_sync_handlerAndrew Morgan2020-03-194-25/+43
|\| | |
| * | | Merge pull request #6484 from matrix-org/erikj/port_sync_handlerErik Johnston2019-12-094-25/+43
| |\ \ \ | | |/ / | |/| |
| | * | Fixup functions to consistently return deferredsErik Johnston2019-12-062-7/+21
| | * | Port SyncHandler to async/awaitErik Johnston2019-12-052-18/+22
* | | | Merge pull request #6469 from matrix-org/erikj/make_database_classAndrew Morgan2020-03-1914-113/+179
|\| | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_datab...Erik Johnston2019-12-063-2/+15
| |\| |
| * | | Move background update handling out of storeErik Johnston2019-12-057-49/+113
| * | | Move DB pool and helper functions into dedicated Database classErik Johnston2019-12-0514-64/+66
* | | | Merge pull request #6482 from matrix-org/erikj/port_rest_v1Andrew Morgan2020-03-193-2/+15
|\ \ \ \ | | |/ / | |/| |
| * | | Fixup testsErik Johnston2019-12-053-2/+15
| |/ /
* | | Merge pull request #6464 from matrix-org/erikj/make_public_sql_baseAndrew Morgan2020-03-1910-47/+47
|\| |
| * | Remove underscore from SQLBaseStore functionsErik Johnston2019-12-0410-47/+47
* | | Merge pull request #6329 from matrix-org/babolivier/context_filtersAndrew Morgan2020-03-194-100/+384
|\| |
| * | Merge pull request #6329 from matrix-org/babolivier/context_filtersBrendan Abolivier2019-12-044-100/+384
| |\ \
| | * | Un-remove room purge testBrendan Abolivier2019-12-041-0/+72
| | * | Merge branch 'babolivier/context_filters' of github.com:matrix-org/synapse in...Brendan Abolivier2019-12-041-1/+1
| | |\ \
| | | * \ Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-11-267-19/+399
| | | |\ \
| | * | \ \ Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-0420-77/+846
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | LintBrendan Abolivier2019-11-051-30/+41
| | * | | | Update copyrightsBrendan Abolivier2019-11-054-1/+10
| | * | | | Add tests for /searchBrendan Abolivier2019-11-051-44/+143
| | * | | | Merge labels tests for /context and /messagesBrendan Abolivier2019-11-051-146/+130
| | * | | | Add test caseBrendan Abolivier2019-11-051-0/+182
* | | | | | privacy by default for room dir (#6355)Andrew Morgan2020-03-191-0/+52
|\| | | | |
| * | | | | privacy by default for room dir (#6355)Neil Johnson2019-12-041-0/+52
* | | | | | Add ephemeral messages support (MSC2228) (#6409)Andrew Morgan2020-03-191-0/+101
|\| | | | |
| * | | | | Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-031-0/+101
| | |/ / / | |/| | |
* | | | | Fix: Pillow error when uploading RGBA image (#3325) (#6241)Andrew Morgan2020-03-191-0/+140
|\| | | |
| * | | | Add testsErik Johnston2019-11-281-0/+140
* | | | | Implementation of MSC2314 (#6176)Andrew Morgan2020-03-189-52/+148
|\| | | |
| * | | | Implementation of MSC2314 (#6176)Amber Brown2019-11-289-52/+148
* | | | | add etag and count to key backup endpoints (#5858)Andrew Morgan2020-03-182-4/+35
|\| | | |
| * | | | add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-272-4/+35
* | | | | Merge pull request #6358 from matrix-org/babolivier/message_retentionAndrew Morgan2020-03-181-2/+4
|\| | | |
| * | | | Merge pull request #6358 from matrix-org/babolivier/message_retentionBrendan Abolivier2019-11-271-0/+293
| |\ \ \ \
| | * \ \ \ Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-268-19/+351
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Don't restrict the tests to v1 roomsBrendan Abolivier2019-11-261-2/+0
| | * | | | Lint againBrendan Abolivier2019-11-191-10/+2
| | * | | | LintBrendan Abolivier2019-11-191-50/+23
| | * | | | Don't apply retention policy based filtering on state eventsBrendan Abolivier2019-11-061-0/+10
| | * | | | Implement per-room message retention policiesBrendan Abolivier2019-11-041-0/+320
* | | | | | Remove assertion and provide a clear warning on startup for missing public_ba...Andrew Morgan2020-03-181-0/+1
|\| | | | |
| * | | | | Remove assertion and provide a clear warning on startup for missing public_ba...Andrew Morgan2019-11-261-0/+1
| | |/ / / | |/| | |
* | | | | Improve the performance of structured logging (#6322)Andrew Morgan2020-03-181-0/+2
|\| | | |
| * | | | Improve the performance of structured logging (#6322)Amber Brown2019-11-261-0/+2
* | | | | Merge pull request #6392 from matrix-org/babolivier/fix-1623Andrew Morgan2020-03-181-0/+74
|\| | | |
| * | | | LintBrendan Abolivier2019-11-201-6/+8
| * | | | Test if a purge can make /messages return 500 responsesBrendan Abolivier2019-11-201-0/+72
* | | | | Blacklist PurgeRoomTestCase (#6361)Andrew Morgan2020-03-181-0/+2
|\| | | |
| * | | | Blacklist PurgeRoomTestCase (#6361)Andrew Morgan2019-11-131-0/+2
* | | | | Merge pull request #6295 from matrix-org/erikj/split_purge_historyAndrew Morgan2020-03-182-8/+11
|\| | | |
| * | | | Merge pull request #6295 from matrix-org/erikj/split_purge_historyErik Johnston2019-11-082-8/+11
| |\ \ \ \
| | * | | | Fix deleting state groups during room purge.Erik Johnston2019-11-061-1/+3
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-11-051-0/+51
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-11-0412-21/+693
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-10-315-51/+197
| | |\ \ \ \
| | * | | | | Split purge API into events vs stateErik Johnston2019-10-301-7/+8
* | | | | | | Fix bug which caused rejected events to be stored with the wrong room state ...Andrew Morgan2020-03-162-11/+176
|\| | | | | |
| * | | | | | Fix bug which caused rejected events to be stored with the wrong room state ...Richard van der Hoff2019-11-062-11/+176
* | | | | | | Merge pull request #6331 from matrix-org/rav/url_preview_limit_titleAndrew Morgan2020-03-161-0/+35
|\| | | | | |
| * | | | | | Merge branch 'develop' into rav/url_preview_limit_titleRichard van der Hoff2019-11-0527-99/+1065
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Apply suggestions from code reviewRichard van der Hoff2019-11-051-0/+1
| * | | | | | Strip overlong OpenGraph data from url previewRichard van der Hoff2019-11-051-0/+34
* | | | | | | Remove the psutil dependency (#6318)Andrew Morgan2020-03-161-0/+51
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Remove the psutil dependency (#6318)Amber Brown2019-11-051-0/+51
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #6301 from matrix-org/babolivier/msc2326Andrew Morgan2020-03-165-6/+300
|\| | | | |
| * | | | | Merge pull request #6301 from matrix-org/babolivier/msc2326Brendan Abolivier2019-11-014-5/+297
| |\ \ \ \ \
| | * | | | | Incorporate reviewBrendan Abolivier2019-11-013-12/+12
| | * | | | | Incorporate reviewBrendan Abolivier2019-11-013-15/+15
| | * | | | | LintBrendan Abolivier2019-10-303-43/+34
| | * | | | | Add integration tests for /messagesBrendan Abolivier2019-10-301-1/+101
| | * | | | | Add more integration testingBrendan Abolivier2019-10-301-6/+39
| | * | | | | Add integration tests for syncBrendan Abolivier2019-10-302-5/+122
| | * | | | | Add unit testsBrendan Abolivier2019-10-301-0/+51
| * | | | | | Factor out an _AsyncEventContextImpl (#6298)Richard van der Hoff2019-11-011-1/+3
| * | | | | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-015-6/+382
* | | | | | | Merge pull request #5727 from matrix-org/uhoreg/e2e_cross-signing2-part3Andrew Morgan2020-03-162-9/+11
|\| | | | | |
| * | | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-315-51/+197
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | rename get_devices_by_remote to get_device_updates_by_remoteHubert Chathi2019-10-302-8/+8
| * | | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-3015-27/+126
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-247-20/+68
| |\ \ \ \ \ \
| * | | | | | | fix unit testHubert Chathi2019-10-221-1/+3
* | | | | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storageAndrew Morgan2020-03-164-51/+116
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storageErik Johnston2019-10-313-50/+114
| |\ \ \ \ \ \ \
| | * | | | | | | Port to use state storageErik Johnston2019-10-303-50/+114
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge pull request #6307 from matrix-org/erikj/fix_purge_roomAndrew Morgan2020-03-162-1/+83
|\| | | | | | |
| * | | | | | | Add unit test for /purge_room APIErik Johnston2019-10-312-1/+83
| |/ / / / / /
* | | | | | | Merge pull request #6240 from matrix-org/erikj/split_out_persistence_storeAndrew Morgan2020-03-1610-22/+41
|\| | | | | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_...Erik Johnston2019-10-307-8/+142
| |\ \ \ \ \ \
| * | | | | | | Review commentsErik Johnston2019-10-302-6/+9
| * | | | | | | Use new EventPersistenceStoreErik Johnston2019-10-238-16/+32
* | | | | | | | Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptorAndrew Morgan2020-03-162-3/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Make ObservableDeferred.observe() always return deferred.Erik Johnston2019-10-302-3/+3
* | | | | | | | Merge pull request #6279 from matrix-org/erikj/federation_server_async_awaitAndrew Morgan2020-03-161-0/+3
|\| | | | | | |
| * | | | | | | Port federation_server to async/awaitErik Johnston2019-10-291-0/+3
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #6263 from matrix-org/erikj/caches_return_deferredsAndrew Morgan2020-03-161-2/+2
|\| | | | | |
| * | | | | | Quick fix to ensure cache descriptors always return deferredsErik Johnston2019-10-281-2/+2
* | | | | | | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keysAndrew Morgan2020-03-161-0/+75
|\| | | | | |
| * | | | | | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keysHubert Chathi2019-10-251-0/+75
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | remove unneeded importsHubert Chathi2019-10-251-3/+1
| | * | | | | switch to using HomeserverTestCaseHubert Chathi2019-10-251-19/+25
| | * | | | | remove some unnecessary linesHubert Chathi2019-10-241-5/+0
| | * | | | | delete keys when deleting backupsHubert Chathi2019-10-241-0/+76
| | | |_|/ / | | |/| | |
* | | | | | Merge pull request #6255 from matrix-org/erikj/stats_configAndrew Morgan2020-03-161-0/+2
|\| | | | |
| * | | | | Fix testsErik Johnston2019-10-251-0/+2
| |/ / / /
* | | | | Option to suppress resource exceeded alerting (#6173)Andrew Morgan2020-03-162-3/+57
|\| | | |
| * | | | Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-242-3/+57
| |/ / /
* | | | Merge pull request #6231 from matrix-org/erikj/refactor_storesAndrew Morgan2020-03-166-17/+11
|\| | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2019-10-221-1/+294
| |\| |
| * | | Fix postgres unit tests to use prepare_databaseErik Johnston2019-10-221-10/+2
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2019-10-221-0/+65
| |\ \ \
| * | | | Move storage classes into a main "data store".Erik Johnston2019-10-215-7/+9
* | | | | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Andrew Morgan2020-03-161-1/+294
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-1829-249/+1136
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-073-60/+125
| |\ \ \ \
| * | | | | use something that's the right type for user_idHubert Chathi2019-09-061-1/+1
| * | | | | fix testHubert Chathi2019-09-051-1/+3
| * | | | | add testHubert Chathi2019-09-041-0/+88
| * | | | | make isort happyHubert Chathi2019-09-041-0/+1
| * | | | | make black happyHubert Chathi2019-09-041-85/+62
| * | | | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-041-1/+226
* | | | | | Remove Auth.check method (#6217)Andrew Morgan2020-03-161-0/+65
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-1829-249/+1136
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-073-60/+125
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| * | | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-048-119/+544
| |\ \ \ \
| * \ \ \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-2817-56/+944
| |\ \ \ \ \
| * | | | | | fix formattingHubert Chathi2019-08-011-1/+3
| * | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-0116-106/+279
| |\ \ \ \ \ \
| * | | | | | | allow uploading keys for cross-signingHubert Chathi2019-07-251-0/+63
* | | | | | | | Fix presence timeouts when synchrotron restarts. (#6212)Andrew Morgan2020-02-261-0/+39
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Fix presence timeouts when synchrotron restarts. (#6212)Erik Johnston2019-10-181-0/+39
* | | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageAndrew Morgan2020-02-261-6/+6
|\| | | | | | |
| * | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageHubert Chathi2019-10-111-6/+6
| |\ \ \ \ \ \ \
| | * | | | | | | make storage layer in charge of interpreting the device key dataHubert Chathi2019-10-101-6/+6
* | | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionAndrew Morgan2020-02-261-16/+31
|\| | | | | | | |
| * | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-111-16/+31
| |\ \ \ \ \ \ \ \
| | * | | | | | | | change test name to be uniqueHubert Chathi2019-10-101-1/+1
| | * | | | | | | | make version optional in body of e2e backup version updateHubert Chathi2019-10-091-16/+31
| | |/ / / / / / /
* | | | | | | | | Fix MAU reaping where reserved users are specified. (#6168)Andrew Morgan2020-02-261-9/+49
|\| | | | | | | |
| * | | | | | | | Fix MAU reaping where reserved users are specified. (#6168)Neil Johnson2019-10-111-9/+49
* | | | | | | | | Merge pull request #6186 from matrix-org/erikj/disable_sql_bytesAndrew Morgan2020-02-261-1/+1
|\| | | | | | | |
| * | | | | | | | Fix postgres unit testsErik Johnston2019-10-101-1/+1
* | | | | | | | | Merge pull request #6127 from matrix-org/erikj/patch_innerAndrew Morgan2020-02-262-96/+2
|\| | | | | | | |
| * | | | | | | | Merge pull request #6127 from matrix-org/erikj/patch_innerErik Johnston2019-10-102-96/+2
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_innerErik Johnston2019-10-103-11/+18
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Move patch_inline_callbacks into synapse/Erik Johnston2019-10-102-181/+2
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_innerErik Johnston2019-10-095-53/+182
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | UpdateErik Johnston2019-09-271-8/+15
| | * | | | | | | | | Patch inlinecallbacks for log contextsErik Johnston2019-09-271-4/+82
* | | | | | | | | | | Add domain validation when creating room with list of invitees (#6121)Andrew Morgan2020-02-261-0/+9
|\| | | | | | | | | |
| * | | | | | | | | | Add domain validation when creating room with list of invitees (#6121)werner2912019-10-101-0/+9
* | | | | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)Andrew Morgan2020-02-261-1/+1
|\| | | | | | | | | |
| * | | | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)krombel2019-10-101-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Fix races in room stats (and other) updates. (#6187)Andrew Morgan2020-02-262-2/+2
|\| | | | | | | | |
| * | | | | | | | | Fix races in room stats (and other) updates. (#6187)Richard van der Hoff2019-10-102-2/+2
* | | | | | | | | | Refactor HomeserverConfig so it can be typechecked (#6137)Andrew Morgan2020-02-261-9/+16
|\| | | | | | | | |
| * | | | | | | | | Refactor HomeserverConfig so it can be typechecked (#6137)Amber Brown2019-10-101-9/+16
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revokedAndrew Morgan2020-02-261-4/+1
|\| | | | | | | |
| * | | | | | | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revokedBrendan Abolivier2019-10-041-0/+81
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Lint (again)Brendan Abolivier2019-10-031-3/+1
| | * | | | | | | | LintBrendan Abolivier2019-10-031-5/+5
| | * | | | | | | | Add test caseBrendan Abolivier2019-10-031-0/+83
* | | | | | | | | | Land improved room list based on room stats (#6019)Andrew Morgan2020-02-261-39/+0
|\| | | | | | | | |
| * | | | | | | | | Land improved room list based on room stats (#6019)Erik Johnston2019-10-021-39/+0
| * | | | | | | | | Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-022-0/+47
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timingsAndrew Morgan2020-02-261-0/+11
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timingsErik Johnston2019-10-021-0/+11
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix errors storing large retry intervals.Erik Johnston2019-10-021-0/+11
| | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge pull request #6145 from matrix-org/erikj/fix_censored_redactionsAndrew Morgan2020-02-261-0/+36
|\| | | | | | | | |
| * | | | | | | | | Fix fetching censored redactions from DBErik Johnston2019-10-021-0/+36
| |/ / / / / / / /
* | | | | | | | | Merge pull request #6125 from matrix-org/babolivier/deactivation-inviteAndrew Morgan2020-02-261-17/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | okBrendan Abolivier2019-09-271-1/+3
| * | | | | | | | LintBrendan Abolivier2019-09-271-7/+1
| * | | | | | | | Add test to validate the changeBrendan Abolivier2019-09-271-13/+57
| |/ / / / / / /
* | | | | | | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2020-02-262-2/+9
|\| | | | | | |
* | | | | | | | Fix dummy event insertion consent bug (#6053)Andrew Morgan2020-02-252-9/+178
|\| | | | | | |
| * | | | | | | Fix dummy event insertion consent bug (#6053)Neil Johnson2019-09-262-9/+178
* | | | | | | | Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2Andrew Morgan2020-02-251-0/+71
|\| | | | | | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us...Erik Johnston2019-09-253-31/+103
| |\ \ \ \ \ \ \
| * | | | | | | | Test that pruning of old user IPs worksErik Johnston2019-09-241-0/+71