summary refs log tree commit diff
path: root/tests/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'de119063f' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-033-18/+22
|\
| * Convert device handler to async/await (#7871)Patrick Cloke2020-07-172-12/+11
| * Convert _base, profile, and _receipts handlers to async/await (#7860)Patrick Cloke2020-07-171-6/+11
* | Merge commit 'a973bcb8a' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-033-239/+424
|\|
| * Fix testsErik Johnston2020-07-151-2/+2
| * Convert E2E key and room key handlers to async/await. (#7851)Patrick Cloke2020-07-152-237/+422
* | Merge commit '43726783e' into dinsicAndrew Morgan2020-08-032-36/+36
|\|
| * Convert the appservice handler to async/await. (#7775)Patrick Cloke2020-07-061-33/+35
| * isort 5 compatibility (#7786)Will Hunt2020-07-051-3/+1
* | Merge commit 'dc80a0762' into dinsicAndrew Morgan2020-08-031-2/+208
|\|
| * Additional configuration options for auto-join rooms (#7763)Patrick Cloke2020-06-301-2/+210
* | Merge commit '363082561' into dinsicAndrew Morgan2020-08-031-6/+7
|\|
| * Convert the typing handler to async/await. (#7679)Patrick Cloke2020-06-171-6/+7
* | Merge commit '03619324f' into dinsicAndrew Morgan2020-08-034-7/+109
|\|
| * Ensure etag is a string for GET room_keys/version response (#7691)Hubert Chathi2020-06-151-0/+1
| * Add option to enable encryption by default for new rooms (#7639)Andrew Morgan2020-06-102-5/+104
* | Add option to autobind user's email on registration (#51)Andrew Morgan2020-07-021-1/+84
* | Merge branch 'release-v1.15.0' of github.com:matrix-org/synapse into dinsic-r...Andrew Morgan2020-06-244-14/+20
|\|
| * Convert user directory handler and related classes to async/await. (#7640)Patrick Cloke2020-06-051-4/+4
| * Add an option to disable autojoin for guest accounts (#6637)Travis Ralston2020-06-051-0/+10
| * Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-051-5/+1
| * Fix encryption algorithm typos in tests/comments (#7637)Andrew Morgan2020-06-041-5/+5
* | Add a bulk user info endpoint and deprecate the old one (#46)Andrew Morgan2020-06-191-1/+134
* | Merge branch 'release-v1.14.0' of github.com:matrix-org/synapse into dinsic-r...Andrew Morgan2020-06-104-4/+642
|\|
| * Add ability to wait for replication streams (#7542)Erik Johnston2020-05-221-1/+4
| * Support UI Authentication for OpenID Connect accounts (#7457)Patrick Cloke2020-05-151-5/+10
| * Implement room version 6 (MSC2240). (#7506)Patrick Cloke2020-05-151-3/+3
| * Strictly enforce canonicaljson requirements in a new room version (#7381)Patrick Cloke2020-05-141-1/+66
| * Extend spam checker to allow for multiple modules (#7435)Andrew Morgan2020-05-081-2/+2
| * Implement OpenID Connect-based login (#7256)Quentin Gliech2020-05-081-0/+565
* | Merge branch 'release-v1.13.0' of github.com:matrix-org/synapse into dinsic-r...Andrew Morgan2020-06-105-66/+242
|\|
| * Stop Auth methods from polling the config on every req. (#7420)Andrew Morgan2020-05-062-14/+22
| * async/await is_server_admin (#7363)Andrew Morgan2020-05-012-36/+53
| * Convert auth handler to async/await (#7261)Patrick Cloke2020-04-152-29/+55
| * Allow admins to create aliases when they are not in the room (#7191)Patrick Cloke2020-04-011-0/+62
| * Merge pull request #7157 from matrix-org/rev.outbound_device_pokes_testsRichard van der Hoff2020-03-301-1/+1
| |\
| | * Remove spurious "name" parameter to `default_config`Richard van der Hoff2020-03-241-1/+1
| * | Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-271-1/+64
| |/
| * Revert "Add options to disable setting profile info for prevent changes. (#70...Richard van der Hoff2020-03-171-32/+1
| * Add options to disable setting profile info for prevent changes. (#7053)Brendan Abolivier2020-03-101-1/+32
| |\
| | * updates after reviewdklimpel2020-03-091-3/+3
| | * fix testsdklimpel2020-03-091-2/+2
| | * add testsdklimpel2020-03-091-3/+3
| | * Add options to disable setting profile info for prevent changes.dklimpel2020-03-081-1/+32
* | | Fix and refactor rewritten IS url feature. Add sample config docs (#40)Andrew Morgan2020-04-221-3/+4
* | | Allow deleting an alias if the user has sufficient power level (#6986)Andrew Morgan2020-03-241-24/+104
|\| |
| * | Allow deleting an alias if the user has sufficient power level (#6986)Patrick Cloke2020-03-041-24/+104
* | | Validate the alt_aliases property of canonical alias events (#6971)Andrew Morgan2020-03-241-36/+30
|\| |
| * | Validate the alt_aliases property of canonical alias events (#6971)Patrick Cloke2020-03-031-36/+30
| |/
* | Store room version on invite (#6983)Andrew Morgan2020-03-241-0/+1
|\|
| * Store room version on invite (#6983)Richard van der Hoff2020-02-261-0/+1
* | Port PresenceHandler to async/await (#6991)Andrew Morgan2020-03-241-6/+12
|\|
| * Port PresenceHandler to async/await (#6991)Erik Johnston2020-02-261-6/+12
* | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Andrew Morgan2020-03-243-11/+11
|\|
| * Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-213-11/+11
* | Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableAndrew Morgan2020-03-241-2/+2
|\|
| * Refactor the membership check methods in AuthRichard van der Hoff2020-02-181-2/+2
* | Stop sending events when creating or deleting aliases (#6904)Andrew Morgan2020-03-241-2/+152
|\|
| * Stop sending events when creating or deleting aliases (#6904)Patrick Cloke2020-02-181-2/+152
* | Convert the directory handler tests to use HomeserverTestCase (#6919)Andrew Morgan2020-03-231-24/+17
|\|
| * 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)Andrew Morgan2020-03-231-0/+92
|\|
| * Filter the results of user directory searching via the spam checker (#6888)Patrick Cloke2020-02-141-0/+92
* | Reject device display names that are too long (#6882)Andrew Morgan2020-03-231-0/+18
|\|
| * Reject device display names that are too long (#6882)Patrick Cloke2020-02-101-0/+18
* | Add typing to synapse.federation.sender (#6871)Andrew Morgan2020-03-231-2/+6
|\|
| * Add typing to synapse.federation.sender (#6871)Erik Johnston2020-02-071-2/+6
* | Merge pull request #6856 from matrix-org/rav/redact_changes/6Andrew Morgan2020-03-231-2/+4
|\|
| * Pass room_version into `event_from_pdu_json`Richard van der Hoff2020-02-061-2/+4
* | Merge pull request #6806 from matrix-org/rav/redact_changes/3Andrew Morgan2020-03-231-2/+2
|\|
| * Merge pull request #6806 from matrix-org/rav/redact_changes/3Richard van der Hoff2020-01-311-2/+2
| |\
| | * Store the room version in EventBuilderRichard van der Hoff2020-01-301-2/+2
* | | Merge pull request #6820 from matrix-org/rav/get_room_version_idAndrew Morgan2020-03-231-1/+1
|\| |
| * | s/get_room_version/get_room_version_id/Richard van der Hoff2020-01-311-1/+1
| |/
* | Resync remote device list when detected as stale. (#6786)Andrew Morgan2020-03-231-3/+3
|\|
| * Resync remote device list when detected as stale. (#6786)Erik Johnston2020-01-301-3/+3
* | Add `local_current_membership` table (#6655)Andrew Morgan2020-03-231-2/+2
|\|
| * Add `local_current_membership` table (#6655)Erik Johnston2020-01-151-2/+2
* | Kill off RegistrationError (#6691)Andrew Morgan2020-03-231-2/+0
|\|
| * Kill off RegistrationError (#6691)Richard van der Hoff2020-01-131-2/+0
* | Add database config class (#6513)Andrew Morgan2020-03-201-19/+20
|\|
| * Add database config class (#6513)Erik Johnston2019-12-181-19/+20
* | 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
* | Back out perf regression from get_cross_signing_keys_from_cache. (#6494)Andrew Morgan2020-03-191-0/+8
|\|
| * Back out perf regression from get_cross_signing_keys_from_cache. (#6494)Neil Johnson2019-12-091-0/+8
* | Merge pull request #6484 from matrix-org/erikj/port_sync_handlerAndrew Morgan2020-03-192-23/+34
|\|
| * Merge pull request #6484 from matrix-org/erikj/port_sync_handlerErik Johnston2019-12-092-23/+34
| |\
| | * Fixup functions to consistently return deferredsErik Johnston2019-12-061-6/+18
| | * Port SyncHandler to async/awaitErik Johnston2019-12-051-17/+16
* | | Merge pull request #6469 from matrix-org/erikj/make_database_classAndrew Morgan2020-03-192-41/+69
|\| |
| * | Move background update handling out of storeErik Johnston2019-12-052-20/+48
| * | Move DB pool and helper functions into dedicated Database classErik Johnston2019-12-052-21/+21
| |/
* | Merge pull request #6464 from matrix-org/erikj/make_public_sql_baseAndrew Morgan2020-03-192-21/+21
|\|
| * Remove underscore from SQLBaseStore functionsErik Johnston2019-12-042-21/+21
* | Implementation of MSC2314 (#6176)Andrew Morgan2020-03-181-0/+3
|\|
| * Implementation of MSC2314 (#6176)Amber Brown2019-11-281-0/+3
* | add etag and count to key backup endpoints (#5858)Andrew Morgan2020-03-181-0/+31
|\|
| * add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-271-0/+31
* | Fix bug which caused rejected events to be stored with the wrong room state ...Andrew Morgan2020-03-161-0/+126
|\|
| * Fix bug which caused rejected events to be stored with the wrong room state ...Richard van der Hoff2019-11-061-0/+126
* | Merge pull request #5727 from matrix-org/uhoreg/e2e_cross-signing2-part3Andrew Morgan2020-03-161-2/+2
|\|
| * rename get_devices_by_remote to get_device_updates_by_remoteHubert Chathi2019-10-301-2/+2
* | 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 #6255 from matrix-org/erikj/stats_configAndrew Morgan2020-03-161-0/+2
|\|
| * Fix testsErik Johnston2019-10-251-0/+2
* | Merge pull request #6231 from matrix-org/erikj/refactor_storesAndrew Morgan2020-03-161-4/+4
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2019-10-221-1/+294
| |\
| * \ 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-211-4/+4
* | | | 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-186-59/+185
| |\ \ \ | | | |/ | | |/|
| * | | 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-186-59/+185
| |\ \ \ | | |/ / | |/| / | | |/
| * | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-042-112/+533
| |\ \
| * | | fix formattingHubert Chathi2019-08-011-1/+3
| * | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-011-2/+2
| |\ \ \
| * | | | 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 #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 races in room stats (and other) updates. (#6187)Andrew Morgan2020-02-261-1/+1
|\| | | | |
| * | | | | Fix races in room stats (and other) updates. (#6187)Richard van der Hoff2019-10-101-1/+1
| |/ / / /
* | | | | 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
| |/ / / /
* | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2020-02-251-2/+16
|\| | | |
* | | | | Implement MSC2290 (#6043)Andrew Morgan2020-02-251-6/+5
|\| | | |
* | | | | Add 'failure_ts' column to 'destinations' table (#6016)Andrew Morgan2020-02-251-1/+6
|\| | | |
| * | | | Add 'failure_ts' column to 'destinations' table (#6016)Richard van der Hoff2019-09-171-1/+6
* | | | | Fix existing v2 identity server calls (MSC2140) (#6013)Andrew Morgan2020-02-252-1/+1
|\| | | |
* | | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-usersAndrew Morgan2020-02-251-2/+27
|\| | | |
| * | | | Only count real users when checking for auto-creation of auto-join roomJason Robinson2019-09-091-2/+27
| | |_|/ | |/| |
* | | | Remove extraneous unittest.DEBUG'sAndrew Morgan2020-02-251-1/+0
* | | | Increase expected state events in tests for new room by oneAndrew Morgan2020-02-251-1/+6
* | | | Fix and refactor room and user stats (#5971)Andrew Morgan2020-02-251-111/+532
|\| | |
| * | | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-041-111/+532
* | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2020-02-241-1/+1
|\| | |
| * | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-301-1/+1
| | |/ | |/|
* | | Remove non-functional 'expire_access_token' setting (#5782)Andrew Morgan2020-02-201-1/+1
|\| |
| * | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-301-1/+1
* | | Replace returnValue with return (#5736)Andrew Morgan2020-02-191-1/+1
|\| |
| * | Replace returnValue with return (#5736)Amber Brown2019-07-231-1/+1
| |/
* | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataAndrew Morgan2020-02-171-0/+210
|\|
| * Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataErik Johnston2019-07-151-0/+210
| |\
| | * Fixup from review comments.Erik Johnston2019-07-041-5/+5
| | * Add basic function to get all data for a user out of synapseErik Johnston2019-07-021-0/+210
* | | Implement access token expiry (#5660)Andrew Morgan2020-02-172-6/+19
|\| |
| * | Implement access token expiry (#5660)Richard van der Hoff2019-07-122-6/+19
* | | Merge pull request #5658 from matrix-org/babolivier/is-jsonAndrew Morgan2020-02-171-4/+4
|\| |
* | | Remove access-token support from RegistrationStore.register (#5642)Andrew Morgan2020-02-172-16/+6
|\| |
| * | Remove access-token support from RegistrationStore.register (#5642)Richard van der Hoff2019-07-102-16/+6
* | | Remove access-token support from RegistrationHandler.register (#5641)Andrew Morgan2020-02-171-25/+28
|\| |
| * | Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-081-25/+28
* | | Move get_or_create_user to test code (#5628)Andrew Morgan2020-02-171-9/+59
|\| |
| * | Move get_or_create_user to test code (#5628)Richard van der Hoff2019-07-081-9/+59
| |/
| * Run Black. (#5482)Amber Brown2019-06-207-51/+45
* | Fix with isort==4.3.21 and black==19.3b0Andrew Morgan2020-02-141-2/+2
* | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-119-97/+75
* | Capatilise letters after a - in new user displaynames (#14)Andrew Morgan2019-12-021-0/+28
* | Fixup testsBrendan Abolivier2019-10-041-1/+5
* | Lint (again)Brendan Abolivier2019-10-041-3/+1
* | LintBrendan Abolivier2019-10-041-5/+5
* | Add test caseBrendan Abolivier2019-10-041-0/+83
* | Add test case for #5574Brendan Abolivier2019-06-281-0/+108
* | Merge branch 'master' into dinsicBrendan Abolivier2019-06-121-0/+307
|\|
| * Fix background updates to handle redactions/rejections (#5352)Erik Johnston2019-06-061-3/+59
| * Room Statistics (#4338)Amber Brown2019-05-211-0/+251
* | Merge branch 'master' into dinsicBrendan Abolivier2019-06-111-0/+7
|\|
| * Limit UserIds to a length that fits in a state key (#5198)ReidAnderson2019-05-201-0/+7
* | Merge branch 'babolivier/per_room_profiles' into dinsic dinsic_2019-05-17Brendan Abolivier2019-05-172-4/+8
|\|
| * Migrate all tests to use the dict-based config format instead of hanging item...Amber Brown2019-05-132-4/+8
* | Merge branch 'release-v0.99.4' into dinsic dinsic_2019-05-14Brendan Abolivier2019-05-145-265/+217
|\|
| * Run Black on the tests again (#5170)Amber Brown2019-05-105-262/+213
| * Add admin api for sending server_notices (#5121)Richard van der Hoff2019-05-021-2/+2
| * Move admin api impl to its own packageRichard van der Hoff2019-05-011-3/+4
* | Merge branch 'develop' into dinsicAndrew Morgan2019-04-152-3/+177
|\|
| * Fix grammar and document get_current_users_in_room (#4998)Andrew Morgan2019-04-031-2/+2
| * Review commentsErik Johnston2019-03-281-5/+9
| * Add unit testsErik Johnston2019-03-271-1/+171
* | Merge branch 'master' of github.com:matrix-org/synapse into dinsicErik Johnston2019-04-052-69/+63
|\|
| * Make federation endpoints more tolerant of trailing slashes v2 (#4935)Andrew Morgan2019-03-261-3/+3
| * Some more porting to HomeserverTestCase and remove old RESTHelper (#4913)Amber Brown2019-03-221-66/+58
| * Remove trailing slashes from outbound federation requests and retry on 400 (#...Andrew Morgan2019-03-211-0/+2
| |\
| | * 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 branch 'develop' of github.com:matrix-org/synapse into erikj/dinsic-mergedErik Johnston2019-03-215-205/+545
|\| |
| * | Merge pull request #4896 from matrix-org/erikj/disable_room_directoryErik Johnston2019-03-211-1/+58
| |\ \
| | * | Add testErik Johnston2019-03-201-1/+58
| * | | Add testErik Johnston2019-03-201-0/+52
| |/ /
| * | Fix RegistrationTestCaseRichard van der Hoff2019-03-191-2/+9
| * | fix test_auto_create_auto_join_where_no_consent (#4886)Neil Johnson2019-03-191-2/+22
| * | Migrate the user directory initial population to a background task (#4864)Amber Brown2019-03-191-35/+74
| * | 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-141-13/+18
| |\ \ | | |/ | |/|
| | * fixupAmber Brown2019-03-131-20/+1
| | * fixupAmber Brown2019-03-121-16/+20
| | * fixesAmber Brown2019-03-121-4/+12
| | * initialAmber Brown2019-03-111-0/+12
| * | Make federation endpoints more tolerant of trailing slashes for some endpoint...Andrew Morgan2019-03-111-3/+3
| |/
| * Rewrite userdir to be faster (#4537)Amber Brown2019-03-071-41/+225
| * Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-051-2/+2
| * Update test_typing to use HomeserverTestCase. (#4771)Richard van der Hoff2019-03-041-157/+133
* | Merge branch 'master' of github.com:matrix-org/synapse into erikj/dinsic-merg...Erik Johnston2019-03-154-61/+241
|\|
| * Fix registration on workers (#4682)Erik Johnston2019-02-201-1/+1
| * Add configurable room list publishing rulesErik Johnston2019-02-141-0/+1
| * make sure version is in body and wrap in linearizer queueHubert Chathi2019-02-081-0/+72
| * create support user (#4141)Neil Johnson2018-12-142-2/+119
| * Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-061-15/+0
| * Neilj/fix autojoin (#4223)Neil Johnson2018-11-281-1/+11
| * handle empty backups according to latest spec proposal (#4123)Hubert Chathi2018-11-051-42/+37
* | merge master into dinsic, again...Matthew Hodgson2018-11-038-104/+627
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa...Erik Johnston2018-10-251-19/+56
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea...Neil Johnson2018-10-252-0/+436
| | |\
| | * | improve auto room join logic, comments and testsNeil Johnson2018-10-121-4/+17
| | * | move logic into register, fix room alias localpart bug, testsNeil Johnson2018-10-041-19/+43
| * | | Use allow/denyErik Johnston2018-10-251-1/+1
| * | | Add tests for alias creation rulesErik Johnston2018-10-191-0/+48
| | |/ | |/|
| * | Fix roomlist since tokens on Python 3 (#4046)Will Hunt2018-10-171-0/+39
| * | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-092-81/+83
| |\|
| | * Port tests/ to Python 3 (#3808)Amber Brown2018-09-071-3/+1
| | * Merge branch 'master' into developRichard van der Hoff2018-09-061-11/+8
| | |\
| | | * Fix origin handling for pushed transactionsRichard van der Hoff2018-09-051-11/+8
| | * | Fix tests on postgresql (#3740)Amber Brown2018-09-041-68/+75
| * | | try to make flake8 and isort happyHubert Chathi2018-09-061-4/+5
| * | | update to newer Synapse APIsHubert Chathi2018-08-241-0/+1
| * | | Merge branch 'develop' into e2e_backupsHubert Chathi2018-08-2410-469/+514
| |\| |
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Erik Johnston2018-08-221-2/+2
| | |\ \
| | | * \ Merge pull request #3659 from matrix-org/erikj/split_profilesErik Johnston2018-08-221-2/+2
| | | |\ \ | | | | |/ | | | |/|
| | | | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-1710-428/+475
| | | | |\
| | | | * | Split ProfileHandler into master and workerErik Johnston2018-08-171-2/+2
| | * | | | rename error codeNeil Johnson2018-08-181-2/+2
| | |/ / /