summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Make /sync attempt to return device updates for both joined and invited users...Matthew Hodgson2019-05-161-19/+25
* Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-151-2/+2
* Allow client event serialization to be asyncErik Johnston2019-05-145-52/+71
* add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-081-0/+43
* Do checks on aliases for incoming m.room.aliases events (#5128)Brendan Abolivier2019-05-082-4/+33
* Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_inviteErik Johnston2019-05-071-0/+11
|\
| * Rate limit earlyErik Johnston2019-05-021-2/+3
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ratelimit_...Erik Johnston2019-04-263-0/+263
| |\
| * | Ratelimit 3pid invitesErik Johnston2019-04-261-0/+10
* | | Add some limitations to alias creationBrendan Abolivier2019-05-022-2/+23
| |/ |/|
* | Fix infinite loop in presence handlerRichard van der Hoff2019-04-261-0/+5
* | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-1715-237/+275
|\ \
| * \ Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-171-0/+228
| |\ \
| * | | Add config option to block users from looking up 3PIDs (#5010)Brendan Abolivier2019-04-041-0/+5
| | |/ | |/|
| * | Prevent kicking users who aren't in the room (#4999)Andrew Morgan2019-04-041-0/+9
| * | Fix grammar and document get_current_users_in_room (#4998)Andrew Morgan2019-04-038-14/+14
| * | Remove presence lists (#4989)Neil Johnson2019-04-031-165/+2
| * | Merge pull request #4982 from matrix-org/erikj/msc1915Erik Johnston2019-04-033-15/+71
| |\ \
| | * | Correctly handle id_server paramErik Johnston2019-04-021-0/+1
| | * | Remove threepid binding if id server returns 400/404/501Erik Johnston2019-04-021-9/+10
| | * | Fixup docstringsErik Johnston2019-04-021-2/+4
| | * | Allowing specifying IS to use in unbind API.Erik Johnston2019-04-013-7/+18
| | * | For unbind poke IS used during binding of 3PIDErik Johnston2019-04-011-9/+35
| | * | Track IS used to bind 3PIDsErik Johnston2019-04-011-0/+15
| * | | Transfer related groups on room upgrade (#4990)Andrew Morgan2019-04-021-0/+1
| * | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-013-18/+13
| |/ /
| * | Allow password providers to bind emails (#4947)Andrew Morgan2019-03-281-0/+17
| * | Use an assertErik Johnston2019-03-281-2/+1
| * | Review commentsErik Johnston2019-03-281-44/+62
| * | Use event streams to calculate presenceErik Johnston2019-03-271-29/+130
* | | Add management endpoints for account validityBrendan Abolivier2019-04-171-4/+29
| |/ |/|
* | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-171-0/+228
|/
* Support 3PID login in password providers (#4931)Andrew Morgan2019-03-263-8/+51
* Refactor out state delta handling into its own class (#4917)Amber Brown2019-03-252-46/+75
* Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_roomsErik Johnston2019-03-212-2/+11
|\
| * Deny peeking into rooms that have been blockedErik Johnston2019-03-212-2/+11
* | Merge pull request #4904 from matrix-org/erikj/fix_shutdownErik Johnston2019-03-214-2/+13
|\|
| * Revert spurious deleteErik Johnston2019-03-201-0/+4
| * Use flagsErik Johnston2019-03-204-13/+13
| * Move requester check into assert_accepted_privacy_policyErik Johnston2019-03-201-5/+8
| * Only require consent for events with an associated requestErik Johnston2019-03-201-1/+5
* | Merge pull request #4896 from matrix-org/erikj/disable_room_directoryErik Johnston2019-03-212-0/+22
|\ \ | |/ |/|
| * Disable publishing to room list when its disabledErik Johnston2019-03-201-0/+8
| * Pull out config optionErik Johnston2019-03-201-3/+3
| * Return before we logErik Johnston2019-03-201-4/+5
| * Add option to disable search room listsErik Johnston2019-03-191-0/+13
* | Batch up outgoing read-receipts to reduce federation traffic. (#4890)Richard van der Hoff2019-03-201-1/+1
|/
* fix test_auto_create_auto_join_where_no_consent (#4886)Neil Johnson2019-03-192-3/+15
* Migrate the user directory initial population to a background task (#4864)Amber Brown2019-03-191-160/+13
* Add ratelimiting on failed login attempts (#4865)Brendan Abolivier2019-03-181-5/+23
* Add ratelimiting on login (#4821)Brendan Abolivier2019-03-152-2/+38
* Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_workerRichard van der Hoff2019-03-151-55/+24
|\
| * Move client receipt processing to federation sender worker.Richard van der Hoff2019-03-131-33/+4
| * declare a ReadReceipt classRichard van der Hoff2019-03-131-24/+22
* | Merge pull request #4846 from matrix-org/hawkowl/userdir-searchErik Johnston2019-03-141-48/+77
|\ \ | |/ |/|
| * fixupAmber Brown2019-03-131-1/+1
| * fixupAmber Brown2019-03-121-47/+70
| * fixesAmber Brown2019-03-121-39/+6
| * initialAmber Brown2019-03-111-1/+40
* | Transfer local user's push rules on room upgrade (#4838)Andrew Morgan2019-03-121-0/+4
|/
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_...Erik Johnston2019-03-084-205/+155
|\
| * Merge pull request #4829 from matrix-org/erikj/device_list_seen_updatesErik Johnston2019-03-081-3/+7
| |\
| | * When re-syncing device lists reset the stateErik Johnston2019-03-071-3/+7
| * | Add some debug logging for device list handlingErik Johnston2019-03-071-2/+38
| |/
| * Rewrite userdir to be faster (#4537)Amber Brown2019-03-071-185/+37
| * Merge pull request #4815 from matrix-org/erikj/docstringsErik Johnston2019-03-061-7/+26
| |\
| | * Add docstrings from matrix-org-hotfixesErik Johnston2019-03-061-7/+26
| * | Port #4422 debug logging from hotfixesErik Johnston2019-03-061-7/+46
| |/
| * Make registration ratelimiter separate from the main events oneBrendan Abolivier2019-03-061-1/+1
| * Revert "Split ratelimiters in two (one for events, one for registration)"Brendan Abolivier2019-03-063-3/+3
| * Split ratelimiters in two (one for events, one for registration)Brendan Abolivier2019-03-053-3/+3
* | Factor out soft fail checksErik Johnston2019-03-081-5/+22
* | Implement soft failErik Johnston2019-03-061-1/+76
|/
* Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-052-10/+33
* Merge pull request #4699 from matrix-org/erikj/stop_fed_not_in_roomErik Johnston2019-03-051-0/+46
|\
| * clarify commentsErik Johnston2019-03-051-8/+11
| * Only check history visibility when filteringErik Johnston2019-03-041-1/+3
| * s/get_forward_events/get_successor_events/Erik Johnston2019-03-041-1/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_n...Erik Johnston2019-03-046-52/+137
| |\
| * | Update commentsErik Johnston2019-02-271-3/+13
| * | Stop backpaginating when events not visibleErik Johnston2019-02-201-0/+31
* | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keysErik Johnston2019-03-051-168/+174
|\ \ \
| * | | Allow /keys/{changes,query} API to run on workerErik Johnston2019-03-041-2/+2
| * | | Split DeviceHandler into master and workerErik Johnston2019-03-041-168/+174
* | | | Clean up read-receipt handling.Richard van der Hoff2019-03-041-59/+44
|/ / /
* | / Avoid rebuilding Edu objects in worker mode (#4770)Richard van der Hoff2019-03-043-5/+5
| |/ |/|
* | Fix incorrect log about not persisting duplicate state event. (#4776)Richard van der Hoff2019-03-011-3/+4
* | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room...Andrew Morgan2019-02-2621-482/+1672
|\ \
| * | Revert "Prevent showing non-fed rooms in fed /publicRooms"Andrew Morgan2019-02-261-65/+11
| * | Merge pull request #4736 from matrix-org/anoa/public_rooms_federateAndrew Morgan2019-02-261-11/+65
| |\ \
| | * | Cleaner chunk logicAndrew Morgan2019-02-261-5/+4
| | * | Correct indentAndrew Morgan2019-02-261-3/+3
| | * | Correct docstring types and chunk logicAndrew Morgan2019-02-261-10/+11
| | * | Clean up room chunk logicAndrew Morgan2019-02-261-6/+8
| | * | Make not showing non-federated rooms the defaultAndrew Morgan2019-02-261-1/+1
| | * | Result may be NoneAndrew Morgan2019-02-261-1/+1
| | * | Address rich commentsAndrew Morgan2019-02-261-6/+30
| | * | elif not else ifAndrew Morgan2019-02-251-1/+1
| | * | syntax derpAndrew Morgan2019-02-251-1/+1
| | * | Simplify call to generate_room_entryAndrew Morgan2019-02-251-17/+13
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room...Erik Johnston2019-02-2521-477/+1620
| | |\ \
| | * | | Docs and arg name clarificationAndrew Morgan2019-02-251-2/+15
| | * | | Don't restrict non-fed rooms over client APIsAndrew Morgan2019-02-251-11/+18
| | * | | Config option to prevent showing non-fed rooms in fed /publicRoomsAndrew Morgan2019-02-251-2/+15
| * | | | switch from google.com to recaptcha.net for reCAPTCHA (#4731)Matthew Hodgson2019-02-251-2/+2
| * | | | Merge pull request #4737 from matrix-org/erikj/failure_log_tbErik Johnston2019-02-251-1/+5
| |\ \ \ \
| | * | | | Log tracebacks correctlyErik Johnston2019-02-251-1/+5
| | | |/ / | | |/| |
| * | | | Fix typoErik Johnston2019-02-251-1/+1
| * | | | More commentsErik Johnston2019-02-251-0/+4
| * | | | Assert rather than clobber the valuesErik Johnston2019-02-251-2/+2
| * | | | Add comments and paranoiaErik Johnston2019-02-251-2/+23
| * | | | Fix backfill storing incorrect state for eventsErik Johnston2019-02-221-1/+4
| |/ / /
| * | | Run push_receipts_to_remotes as background job (#4707)Richard van der Hoff2019-02-211-34/+34
| * | | Merge pull request #4263 from rkfg/developErik Johnston2019-02-211-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Prevent crash on pagination.rkfg2018-12-061-1/+1
| * | | Fix registration on workers (#4682)Erik Johnston2019-02-203-8/+196
| * | | Merge pull request #4652 from matrix-org/babolivier/acme-delegatedBrendan Abolivier2019-02-191-4/+5
| |\ \ \
| | * | | Fetch ACME domain into an instance memberBrendan Abolivier2019-02-191-4/+5
| | * | | Use a configuration parameter to give the domain to generate a certificate forBrendan Abolivier2019-02-181-25/+4
| | * | | Merge branch 'develop' into babolivier/acme-delegatedBrendan Abolivier2019-02-183-10/+35
| | |\ \ \
| | * | | | Typo in info logAndrew Morgan2019-02-181-1/+1
| | * | | | Various cosmetics to make TravisCI happyBrendan Abolivier2019-02-151-2/+5
| | * | | | Remove unused importBrendan Abolivier2019-02-151-1/+0
| | * | | | Support .well-known delegation when issuing certificates through ACMEBrendan Abolivier2019-02-151-4/+23
| * | | | | Merge pull request #4642 from matrix-org/anoa/bans_room_upgradeAndrew Morgan2019-02-191-0/+22
| |\ \ \ \ \
| | * | | | | lintAndrew Morgan2019-02-181-1/+3
| | * | | | | Move member event processing and changelog fixAndrew Morgan2019-02-181-9/+7
| | * | | | | Membership events are done laterAndrew Morgan2019-02-181-12/+20
| | * | | | | Transfer bans on room upgradeAndrew Morgan2019-02-181-0/+14
| | |/ / / /
| * | | | | Merge pull request #4666 from matrix-org/erikj/register_login_splitErik Johnston2019-02-181-8/+106
| |\ \ \ \ \
| | * | | | | Move register_device into handlerErik Johnston2019-02-181-4/+47
| | * | | | | Split out registration to workerErik Johnston2019-02-181-4/+59
| * | | | | | Merge pull request #4668 from matrix-org/erikj/catch_exceptionsErik Johnston2019-02-181-5/+9
| |\ \ \ \ \ \
| | * | | | | | pep8Erik Johnston2019-02-181-1/+5
| | * | | | | | Correctly handle HttpResponseExceptionErik Johnston2019-02-181-4/+4
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #4667 from matrix-org/erikj/fix_revoke_guest_access_workersErik Johnston2019-02-181-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix kicking guest users in worker modeErik Johnston2019-02-181-1/+1
| | |/ / / /
| * | | | | Merge pull request #4643 from matrix-org/erikj/catch_exceptionsErik Johnston2019-02-182-5/+11
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Correctly handle RequestSendFailed exceptionsErik Johnston2019-02-142-5/+11
| | |/ / /
| * | | | Only fetch aliases when publishing roomsErik Johnston2019-02-141-15/+15
| * | | | Add configurable room list publishing rulesErik Johnston2019-02-141-5/+24
| |/ / /
| * | | Run `black` on user directory code (#4635)Amber Brown2019-02-131-44/+50
| * | | Merge pull request #4608 from matrix-org/anoa/acls_room_upgradeErik Johnston2019-02-121-0/+1
| |\ \ \
| | * | | Transfer Server ACLs on room upgradeAndrew Morgan2019-02-111-0/+1
| * | | | make sure version is in body and wrap in linearizer queueHubert Chathi2019-02-081-11/+26
| * | | | re-try to make isort happyHubert Chathi2019-02-061-1/+1
| * | | | fix import to make isort happyHubert Chathi2019-02-061-2/+7
| * | | | add new endpoint to update backup versionsHubert Chathi2019-02-061-1/+33
| * | | | return proper error codes for some 404sHubert Chathi2019-02-061-4/+16
| |/ / /
| * | | Merge pull request #4530 from matrix-org/anoa/room_upgrade_federatableAndrew Morgan2019-01-311-0/+10
| |\ \ \
| | * | | New function for getting room's create eventAndrew Morgan2019-01-311-7/+1
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrad...Andrew Morgan2019-01-311-1/+13
| | |\ \ \
| | * | | | lintAndrew Morgan2019-01-311-2/+4
| | * | | | Copy over non-federatable trait on room upgradeAndrew Morgan2019-01-301-0/+14
| * | | | | Add some debug for membership syncing issues (#4538)Richard van der Hoff2019-01-311-2/+11
| | |/ / / | |/| | |
| * | | | Fix remote invite rejections not comming down syncErik Johnston2019-01-301-1/+13
| |/ / /
| * | | ACME config cleanups (#4525)Richard van der Hoff2019-01-301-12/+15
| * | | Fix flake8 (#4519)Amber Brown2019-01-302-3/+3
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions...Erik Johnston2019-01-292-1/+10
| |\ \ \
| | * | | Use snder and not event ID domain to check if oursErik Johnston2019-01-291-0/+8
| | * | | Remove event ID usage when checking if new roomErik Johnston2019-01-291-1/+2
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions...Erik Johnston2019-01-292-29/+7
| |\| | |
| | * | | Merge pull request #4481 from matrix-org/erikj/event_builderErik Johnston2019-01-291-28/+6
| | |\ \ \
| | | * | | Correctly set context.app_serviceErik Johnston2019-01-291-0/+2
| | | * | | Refactor event building into EventBuilderErik Johnston2019-01-291-29/+5
| | * | | | Fixup calls to `comput_event_signature`Erik Johnston2019-01-291-1/+1
| | |/ / /
| * / / / Implement rechecking of redactionsErik Johnston2019-01-291-1/+5
| |/ / /
| * | | Merge pull request #4494 from matrix-org/erikj/fixup_event_validatorErik Johnston2019-01-292-3/+8
| |\ \ \
| | * | | Split up event validation between event and builderErik Johnston2019-01-282-3/+8
| * | | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_versionErik Johnston2019-01-283-11/+23
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Correctly use default room version if none is setErik Johnston2019-01-281-2/+2
| | * | | Pass through room version to event authErik Johnston2019-01-253-10/+22
| * | | | Change return syntax in doc stringAndrew Morgan2019-01-281-1/+1
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-282-29/+53
| |\| | |
| | * | | Merge pull request #4470 from matrix-org/erikj/require_format_versionErik Johnston2019-01-252-29/+53
| | |\ \ \
| | | * | | Require event format version to parse or create eventsErik Johnston2019-01-252-29/+53
| * | | | | Reuse predecessor methodAndrew Morgan2019-01-281-12/+8
| * | | | | FixesAndrew Morgan2019-01-251-39/+39
| * | | | | Clean up direct_rooms accessAndrew Morgan2019-01-251-3/+3
| * | | | | Use python magicAndrew Morgan2019-01-251-2/+1
| * | | | | Destructure account data tuple before useAndrew Morgan2019-01-251-3/+3
| * | | | | Remove unnecessary null checkAndrew Morgan2019-01-251-7/+6
| * | | | | Move room_tag declaration to be closer to its useAndrew Morgan2019-01-251-4/+5
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-255-34/+231
| |\| | | |
| | * | | | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_roomsAndrew Morgan2019-01-251-0/+47
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Apply suggestions from code reviewRichard van der Hoff2019-01-241-1/+1
| | | * | | Fix a bug with single-room search searching all roomsAndrew Morgan2019-01-221-32/+10
| | | * | | Search for messages across predecessor roomsAndrew Morgan2019-01-181-0/+69
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813Erik Johnston2019-01-254-33/+183
| | |\ \ \ \
| | | * \ \ \ Merge pull request #4448 from matrix-org/erikj/get_pdu_versionsErik Johnston2019-01-241-2/+15
| | | |\ \ \ \
| | | | * | | | Review commentsErik Johnston2019-01-241-0/+5
| | | | * | | | Add room_version param to get_pduErik Johnston2019-01-231-2/+10
| | | * | | | | Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invitesErik Johnston2019-01-241-29/+3
| | | |\ \ \ \ \
| | | | * | | | | Remove unecessary setting of outlier bitErik Johnston2019-01-241-2/+0
| | | | * | | | | Use term 'out of band membership' insteadErik Johnston2019-01-241-2/+2
| | | | * | | | | Clarify the invite flowsErik Johnston2019-01-231-1/+11
| | | | * | | | | Remove unnecessary '_sign_event'Erik Johnston2019-01-231-14/+0
| | | | * | | | | Store rejected remote invite events as outliersErik Johnston2019-01-231-32/+12
| | | | |/ / / /
| | | * | | | | Change default timeout value from 0 to NoneAndrew Morgan2019-01-241-1/+1
| | | * | | | | Use self.clock instead of datetimeAndrew Morgan2019-01-241-4/+3
| | | * | | | | isortAndrew Morgan2019-01-241-1/+1
| | | * | | | | lintAndrew Morgan2019-01-241-1/+2
| | | * | | | | Time out filtered room dir queries after 60sAndrew Morgan2019-01-241-2/+12
| | | |/ / / /
| | | * | | | Add metric for user dir current event stream positionAndrew Morgan2019-01-231-0/+6
| | | * | | | Support ACME for certificate provisioning (#4384)Amber Brown2019-01-231-0/+147
| | * | | | | Implement MSC 1813 - Add room version to make APIsErik Johnston2019-01-231-1/+1
| | |/ / / /
| * | | | | Move tag and direct state copying into separate functionAndrew Morgan2019-01-251-43/+63
| * | | | | lintAndrew Morgan2019-01-221-1/+3
| * | | | | Prevent duplicate room IDs in m.directAndrew Morgan2019-01-221-10/+9
| * | | | | Fix commentsAndrew Morgan2019-01-221-2/+2
| * | | | | Join logic covers both room creator and arbitrary usersAndrew Morgan2019-01-221-33/+0
| * | | | | tags, m.direct copying over correctlyAndrew Morgan2019-01-222-11/+62
| * | | | | Fix typosAndrew Morgan2019-01-221-8/+8
| * | | | | Migrating dm and room tags work for migratorAndrew Morgan2019-01-221-2/+13
| * | | | | Prevent crash on user who doesn't have any direct roomsAndrew Morgan2019-01-221-1/+1
| * | | | | Preserve DM status of a room on upgradeAndrew Morgan2019-01-221-0/+19
| * | | | | Fix typoAndrew Morgan2019-01-221-2/+2
| |/ / / /
| * / / / Migrate encryption state on room upgrade (#4411)Andrew Morgan2019-01-211-0/+1
| |/ / /
| * | | sign_request -> build_auth_headers (#4408)Richard van der Hoff2019-01-171-3/+6
| * | | don't store more remote device lists if they have more than 1K devices (#4397)Richard van der Hoff2019-01-161-0/+19
| * | | fix NPE in /messages by checking if all events were filtered out (#4330)Matthew Hodgson2019-01-021-10/+11
| * | | Fixed line lengthNathan Pennie2018-12-191-1/+5
| * | | Fix the variable names used for account_dataNathan Pennie2018-12-191-3/+3
| * | | create support user (#4141)Neil Johnson2018-12-143-23/+39
| * | | Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-071-7/+16
| * | | Factor SSO success handling out of CAS login (#4264)Richard van der Hoff2018-12-071-2/+11
| * | | Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-061-29/+0
| |/ /
| * | Add an option to disable search for homeservers which may not be interested i...Travis Ralston2018-12-041-0/+3
| * | Neilj/fix autojoin (#4223)Neil Johnson2018-11-281-2/+21
| * | Remove duplicate slashes in generated consent URLsTravis Ralston2018-11-151-1/+1
| * | Remove hack to support rejoining roomsErik Johnston2018-11-091-74/+42
| * | Simplify to always drop events if server isn't in the roomErik Johnston2018-11-091-14/+9
| * | Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-061-1/+1
| * | handle empty backups according to latest spec proposal (#4123)Hubert Chathi2018-11-051-7/+15
| * | Add helpers for getting prev and auth events (#4139)Erik Johnston2018-11-061-24/+24
| * | Fix typing being reset causing infinite syncs (#4127)Amber Brown2018-11-031-4/+10
| * | Include a version query string arg for the consent routeTravis Ralston2018-10-311-1/+4
| * | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-318-133/+515
| |\ \
| | * \ Merge pull request #4101 from matrix-org/rav/aliases_for_upgradesRichard van der Hoff2018-10-312-14/+140
| | |\ \
| | | * | Avoid else clause on exception for clarityRichard van der Hoff2018-10-311-2/+1
| | | * | Attempt to move room aliases on room upgradesRichard van der Hoff2018-10-312-14/+141
| | * | | Log some bits about event creation (#4121)Richard van der Hoff2018-10-312-0/+7
| | * | | Fix search 500ing (#4122)Amber Brown2018-10-311-2/+6
| | * | | Delete the disused & unspecced identicon functionality (#4106)Amber Brown2018-10-291-3/+0
| | |/ /
| | * | Merge pull request #4100 from matrix-org/rav/room_upgrade_avatarRichard van der Hoff2018-10-291-1/+2
| | |\ \
| | | * | Remember to copy the avatar on room upgradesRichard van der Hoff2018-10-261-1/+2
| | * | | Better handling of odd PLs during room upgradesRichard van der Hoff2018-10-271-44/+81
| | |/ /
| | * | optimise state copyingRichard van der Hoff2018-10-261-7/+5
| | * | Address review commentsRichard van der Hoff2018-10-261-7/+9
| | * | restrict PLs in old roomRichard van der Hoff2018-10-251-1/+43