summary refs log tree commit diff
path: root/tests (follow)
Commit message (Expand)AuthorAgeFilesLines
* Persist user interactive authentication sessions (#7302)Patrick Cloke2020-04-302-4/+44
* Add instance name to RDATA/POSITION commands (#7364)Erik Johnston2020-04-292-2/+5
* Don't relay REMOTE_SERVER_UP cmds to same conn. (#7352)Erik Johnston2020-04-291-0/+62
* Fix limit logic for EventsStream (#7358)Richard van der Hoff2020-04-298-48/+579
* Return total number of users and profile attributes in admin users endpoint (...Manuel Stahl2020-04-282-0/+48
* Add some replication tests (#7278)Erik Johnston2020-04-282-11/+298
* Fix collation for postgres for unit tests (#7359)Richard van der Hoff2020-04-281-1/+4
* Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t...Brendan Abolivier2020-04-232-1/+62
* Another go at fixing one-word commands (#7326)Richard van der Hoff2020-04-221-0/+42
* Extend StreamChangeCache to support multiple entities per stream ID (#7303)Richard van der Hoff2020-04-221-9/+60
* Extend room admin api with additional attributes (#7225)Dirk Klimpel2020-04-222-592/+680
* Add ability to run replication protocol over redis. (#7040)Erik Johnston2020-04-221-2/+2
* Do not treat display names as globs for push rules. (#7271)Patrick Cloke2020-04-161-0/+65
* Convert auth handler to async/await (#7261)Patrick Cloke2020-04-154-57/+104
* Allow specifying the value of Accept-Language header for URL previews (#7265)Andrew Morgan2020-04-151-0/+55
* Fix the parameters of a test fixture (#7243)Zay11Zay2020-04-141-1/+1
* Default PL100 to enable encryption in a room (#7230)Andrew Morgan2020-04-092-4/+297
* Do not allow a deactivated user to login via SSO. (#7240)Patrick Cloke2020-04-091-3/+39
* bg update to clear out duplicate outbound_device_list_pokes (#7193)Richard van der Hoff2020-04-071-0/+52
* Move client command handling out of TCP protocol (#7185)Erik Johnston2020-04-063-29/+25
* Server notices: Dissociate room creation/lookup from invite (#7199)Brendan Abolivier2020-04-041-12/+108
* Merge pull request #7190 from matrix-org/rav/one_bg_update_at_a_timeRichard van der Hoff2020-04-032-13/+22
|\
| * Make do_next_background_update return a boolRichard van der Hoff2020-03-311-3/+3
| * Set a logging context while running the bg updatesRichard van der Hoff2020-03-311-4/+7
| * Make `has_completed_background_updates` asyncRichard van der Hoff2020-03-311-1/+3
| * Remove unused `start_background_update`Richard van der Hoff2020-03-311-5/+9
* | Fix device list update stream ids going backward (#7158)Richard van der Hoff2020-04-031-0/+6
* | Allow admins to create aliases when they are not in the room (#7191)Patrick Cloke2020-04-011-0/+62
|/
* Rewrite prune_old_outbound_device_pokes for efficiency (#7159)Richard van der Hoff2020-03-301-0/+92
* Merge pull request #7157 from matrix-org/rev.outbound_device_pokes_testsRichard van der Hoff2020-03-3010-22/+317
|\
| * Add tests for outbound device pokesRichard van der Hoff2020-03-272-3/+301
| * Remove spurious "name" parameter to `default_config`Richard van der Hoff2020-03-249-19/+16
* | Always whitelist the login fallback for SSO (#7153)Richard van der Hoff2020-03-271-1/+8
* | Admin API to join users to a room. (#7051)Dirk Klimpel2020-03-271-0/+288
* | Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-272-1/+366
* | Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-261-0/+179
* | Validate that the session is not modified during UI-Auth (#7068)Patrick Cloke2020-03-262-2/+69
* | Move catchup of replication streams to worker. (#7024)Erik Johnston2020-03-252-23/+84
* | Clean up some LoggingContext stuff (#7120)Richard van der Hoff2020-03-2411-56/+68
|/
* Convert `*StreamRow` classes to inner classes (#7116)Richard van der Hoff2020-03-231-2/+2
* Improve database configuration docs (#6988)Richard van der Hoff2020-03-201-20/+2
* Change device list streams to have one row per ID (#7010)Erik Johnston2020-03-191-45/+0
|\
| * Remove handling of multiple rows per IDErik Johnston2020-02-281-45/+0
* | Improve get auth chain difference algorithm. (#7095)Erik Johnston2020-03-182-22/+148
* | Share SSL contexts for non-federation requests (#7094)Richard van der Hoff2020-03-172-13/+22
* | Remove special casing of `m.room.aliases` events (#7034)Patrick Cloke2020-03-172-15/+33
* | Revert "Add options to disable setting profile info for prevent changes. (#70...Richard van der Hoff2020-03-172-335/+1
* | Add options to disable setting profile info for prevent changes. (#7053)Brendan Abolivier2020-03-102-1/+335
|\ \
| * | lint, fix testsdklimpel2020-03-091-2/+2
| * | updates after reviewdklimpel2020-03-092-13/+10
| * | fix testsdklimpel2020-03-091-2/+2
| * | lintdklimpel2020-03-091-10/+8
| * | add testsdklimpel2020-03-092-3/+311
| * | Add options to disable setting profile info for prevent changes.dklimpel2020-03-081-1/+32
| |/
* | Remove special auth and redaction rules for aliases events in experimental ro...Patrick Cloke2020-03-092-3/+125
* | Break down monthly active users by appservice_id (#7030)Neil Johnson2020-03-061-0/+42
* | Allow deleting an alias if the user has sufficient power level (#6986)Patrick Cloke2020-03-041-24/+104
* | Read the room version from database when fetching events (#6874)Richard van der Hoff2020-03-041-0/+10
* | Merge branch 'master' into developBrendan Abolivier2020-03-031-0/+111
|\ \
| * | Add a whitelist for the SSO confirmation step.Richard van der Hoff2020-03-021-3/+29
| * | Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1Richard van der Hoff2020-03-021-28/+181
| |\ \
| | * | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-03-021-28/+181
| * | | Add a confirmation step to the SSO login flowBrendan Abolivier2020-03-021-0/+85
| |/ /
* | / Validate the alt_aliases property of canonical alias events (#6971)Patrick Cloke2020-03-033-37/+191
| |/ |/|
* | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-02-281-32/+186
* | set worker_app for frontend proxy test (#7003)Richard van der Hoff2020-02-271-0/+5
* | Store room version on invite (#6983)Richard van der Hoff2020-02-262-0/+9
* | Port PresenceHandler to async/await (#6991)Erik Johnston2020-02-261-6/+12
* | Ensure 'deactivated' parameter is a boolean on user admin API, Fix error hand...Andrew Morgan2020-02-261-0/+59
* | Merge worker apps into one. (#6964)Erik Johnston2020-02-252-10/+6
* | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-2115-105/+87
* | Reduce auth chains fetched during v2 state res. (#6952)Erik Johnston2020-02-191-2/+4
|/
* Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableRichard van der Hoff2020-02-192-2/+19
|\
| * Make room alias lists peekableRichard van der Hoff2020-02-191-0/+17
| * Refactor the membership check methods in AuthRichard van der Hoff2020-02-181-2/+2
* | Move MSC2432 stuff onto unstable prefix (#6948)Richard van der Hoff2020-02-191-3/+13
|/
* Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Richard van der Hoff2020-02-182-10/+88
* Merge pull request #6872 from matrix-org/rav/dictpropertyRichard van der Hoff2020-02-181-1/+1
|\
| * Replace _event_dict_property with DictPropertyRichard van der Hoff2020-02-141-1/+1
* | Stop sending events when creating or deleting aliases (#6904)Patrick Cloke2020-02-181-2/+152
* | Raise the default power levels for invites, tombstones and server acls (#6834)Andrew Morgan2020-02-171-1/+3
* | Convert the directory handler tests to use HomeserverTestCase (#6919)Patrick Cloke2020-02-141-24/+17
|/
* Filter the results of user directory searching via the spam checker (#6888)Patrick Cloke2020-02-141-0/+92
* Return a 404 for admin api user lookup if user not found (#6901)Andrew Morgan2020-02-121-0/+16
* Reject device display names that are too long (#6882)Patrick Cloke2020-02-101-0/+18
* Add a `make_event_from_dict` method (#6858)Richard van der Hoff2020-02-079-27/+32
* Add typing to synapse.federation.sender (#6871)Erik Johnston2020-02-071-2/+6
* Admin api to add an email address (#6789)Dirk Klimpel2020-02-071-2/+17
* Pass room_version into `event_from_pdu_json`Richard van der Hoff2020-02-061-2/+4
* Add typing to SyncHandler (#6821)Erik Johnston2020-02-031-1/+4
* Merge pull request #6806 from matrix-org/rav/redact_changes/3Richard van der Hoff2020-01-312-4/+9
|\
| * Pass room_version into add_hashes_and_signaturesRichard van der Hoff2020-01-301-2/+7
| * Store the room version in EventBuilderRichard van der Hoff2020-01-301-2/+2
* | s/get_room_version/get_room_version_id/Richard van der Hoff2020-01-313-3/+5
|/
* MSC2260: Block direct sends of m.room.aliases events (#6794)Richard van der Hoff2020-01-302-33/+15
* Resync remote device list when detected as stale. (#6786)Erik Johnston2020-01-301-3/+3
* Type defintions for use in refactoring for redaction changes (#6803)Richard van der Hoff2020-01-301-4/+11
* Factor out a `copy_power_levels_contents` methodRichard van der Hoff2020-01-291-2/+43
* Pass room version object into event_auth.check and check_redaction (#6788)Richard van der Hoff2020-01-281-7/+4
* Add `rooms.room_version` column (#6729)Erik Johnston2020-01-273-2/+18
* Validate client_secret parameter (#6767)Andrew Morgan2020-01-241-0/+51
* Make 'event.redacts' never raise. (#6771)Erik Johnston2020-01-231-0/+35
* Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-01-221-4/+389
* Lint + changelogBrendan Abolivier2020-01-221-3/+1
* Remove unused importBrendan Abolivier2020-01-221-1/+1
* Add tests for thumbnailingBrendan Abolivier2020-01-221-3/+45
* Fix and add test to deprecated quarantine media admin api (#6756)Andrew Morgan2020-01-221-4/+11
* Fix `/events/:event_id` deprecated API. (#6731)Erik Johnston2020-01-202-1/+28
* Fix changing password via user admin API. (#6730)Erik Johnston2020-01-201-0/+13
* Log saml assertions rather than the whole responseRichard van der Hoff2020-01-161-0/+47
* Port synapse.replication.tcp to async/await (#6666)Erik Johnston2020-01-161-1/+1
* Fix purge_room admin API (#6711)Erik Johnston2020-01-151-3/+1
* Implement RedirectException (#6687)Richard van der Hoff2020-01-151-2/+77
* Add `local_current_membership` table (#6655)Erik Johnston2020-01-155-17/+14
* Quarantine media by ID or user ID (#6681)Andrew Morgan2020-01-132-0/+378
* 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)Manuel Stahl2020-01-093-338/+467
* Fix GET request on /_synapse/admin/v2/users endpoint (#6563)Manuel Stahl2020-01-081-0/+41
* Back out ill-advised notary server hackery (#6657)Richard van der Hoff2020-01-083-4/+131
* port BackgroundUpdateTestCase to HomeserverTestCase (#6653)Richard van der Hoff2020-01-071-35/+37
* 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)Richard van der Hoff2020-01-061-44/+95
* | Workaround for error when fetching notary's own key (#6620)Richard van der Hoff2020-01-062-1/+140
|/
* Kill off redundant SynapseRequestFactory (#6619)Richard van der Hoff2020-01-031-2/+4
* Split state groups into a separate data store (#6296)Erik Johnston2019-12-202-2/+2
* Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-201-14/+14
* Clean up startup for the pusher (#6558)Richard van der Hoff2019-12-182-0/+7
* 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-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)Will Hunt2019-12-161-0/+2
* | 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)Hubert Chathi2019-12-121-8/+0
* | 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/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_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)Richard van der Hoff2019-12-101-20/+29
* | 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_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)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_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 branch 'develop' of github.com:matrix-org/synapse into erikj/make_datab...Erik Johnston2019-12-063-2/+15
|\|
| * Fixup testsErik Johnston2019-12-053-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
|/
* Remove underscore from SQLBaseStore functionsErik Johnston2019-12-0410-47/+47
* 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)Neil Johnson2019-12-041-0/+52
* | | | Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-031-0/+101
| |/ / |/| |
* | | Add testsErik Johnston2019-11-281-0/+140
* | | Implementation of MSC2314 (#6176)Amber Brown2019-11-289-52/+148
* | | add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-272-4/+35
* | | 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 Morgan2019-11-261-0/+1
| |/ / |/| |
* | | Improve the performance of structured logging (#6322)Amber Brown2019-11-261-0/+2
* | | 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 Morgan2019-11-131-0/+2
* | | 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 ...Richard van der Hoff2019-11-062-11/+176
* | | | | Merge branch 'develop' into rav/url_preview_limit_titleRichard van der Hoff2019-11-0527-99/+1065
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Remove the psutil dependency (#6318)Amber Brown2019-11-051-0/+51
| | |_|/ | |/| |
| * | | 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 branch 'develop' into cross-signing_federationHubert Chathi2019-10-315-51/+197
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | 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
| | | | |/ | | | |/|
| | * / | Add unit test for /purge_room APIErik Johnston2019-10-312-1/+83
| | |/ /
| * | | 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' of github.com:matrix-org/synapse into erikj/split_out_...Erik Johnston2019-10-307-8/+142
| | |\ \
| | | * | Make ObservableDeferred.observe() always return deferred.Erik Johnston2019-10-302-3/+3
| | | * | Port federation_server to async/awaitErik Johnston2019-10-291-0/+3
| | | |/
| | | * 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_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
| | * | | Review commentsErik Johnston2019-10-302-6/+9
| | * | | Use new EventPersistenceStoreErik Johnston2019-10-238-16/+32
| * | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-247-20/+68
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | fix unit testHubert Chathi2019-10-221-1/+3
* | | | | 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
| |_|_|/ |/| | |
* | | | Fix testsErik Johnston2019-10-251-0/+2
| |/ / |/| |
* | | Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-242-3/+57
| |/ |/|
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2019-10-221-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
* | | | 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
|\ \ \ \ | | |_|/ | |/| |
| * | | 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