summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Query missing cross-signing keys on local sig uploadAndrew Morgan2020-04-173-12/+141
* Only register devices edu handler on the master process (#7255)Andrew Morgan2020-04-142-7/+12
* tweak changelog v1.12.3 github/release-v1.12.3 release-v1.12.3Richard van der Hoff2020-04-031-5/+2
* 1.12.3Richard van der Hoff2020-04-034-4/+16
* Fix the debian build in a better way. (#7212)Richard van der Hoff2020-04-034-9/+36
* Fix changelog wording v1.12.2 github/release-v1.12.2 release-v1.12.2Andrew Morgan2020-04-021-1/+1
* 1.12.2Andrew Morgan2020-04-023-1/+17
* Pin Pillow>=4.3.0,<7.1.0 to fix dep issueAndrew Morgan2020-04-021-1/+3
* 1.12.1Andrew Morgan2020-04-023-1/+13
* Note where bugs were introduced v1.12.1rc1Andrew Morgan2020-03-311-3/+3
* 1.12.1rc1Andrew Morgan2020-03-315-4/+12
* NewsfileErik Johnston2020-03-311-0/+1
* Rewrite changelogAndrew Morgan2020-03-311-1/+1
* Add changelogAndrew Morgan2020-03-311-0/+1
* Only import sqlite3 when type checkingDavid Vo2020-03-312-2/+6
* Fix another instanceAndrew Morgan2020-03-311-5/+7
* Only setdefault for signatures if device has key_jsonAndrew Morgan2020-03-311-5/+7
* Fix starting workers when federation sending not split out.Erik Johnston2020-03-311-0/+12
* matrix.org was fine v1.12.0 github/release-v1.12.0 release-v1.12.0Richard van der Hoff2020-03-231-0/+2
* Update CHANGES.mdNeil Johnson2020-03-231-1/+1
* changelog typosRichard van der Hoff2020-03-231-3/+3
* 1.12.0 changelogRichard van der Hoff2020-03-231-1/+53
* 1.12.0Richard van der Hoff2020-03-233-1/+13
* more changelog v1.12.0rc1Richard van der Hoff2020-03-191-1/+1
* changelog fixesRichard van der Hoff2020-03-191-3/+3
* fix typoRichard van der Hoff2020-03-191-2/+2
* 1.12.0rc1Richard van der Hoff2020-03-1960-59/+78
* update grafana dashboardRichard van der Hoff2020-03-191-32/+213
* Fix concurrent modification errors in pusher metrics (#7106)Richard van der Hoff2020-03-192-9/+19
* Add prometheus metrics for the number of active pushers (#7103)Richard van der Hoff2020-03-195-8/+36
* Move pusherpool startup into _base.setup (#7104)Richard van der Hoff2020-03-193-1/+2
* Improve get auth chain difference algorithm. (#7095)Erik Johnston2020-03-186-71/+310
* Add an option to the set password API to choose whether to logout other devic...Patrick Cloke2020-03-185-20/+39
* Update INSTALL.md updated CentOS8 install instructions (#6925)Richard von Kellner2020-03-172-2/+12
* Share SSL contexts for non-federation requests (#7094)Richard van der Hoff2020-03-177-44/+71
* Set charset to utf-8 when adding headers for certain text content types (#7044)The Stranjer2020-03-172-1/+25
* Remove unused federation endpoint (`query_auth`) (#7026)Patrick Cloke2020-03-175-146/+80
* Remove special casing of `m.room.aliases` events (#7034)Patrick Cloke2020-03-175-42/+35
* Revert "Add options to disable setting profile info for prevent changes. (#70...Richard van der Hoff2020-03-177-398/+1
* Populate the room version from state events (#7070)Brendan Abolivier2020-03-163-0/+63
* Fix buggy condition in account validity handler (#7074)Brendan Abolivier2020-03-162-1/+6
* Merge pull request #7067 from matrix-org/babolivier/saml_error_moarBrendan Abolivier2020-03-134-28/+90
|\
| * Use innerText instead of innerHTMLBrendan Abolivier2020-03-131-1/+2
| * LintBrendan Abolivier2020-03-111-2/+1
| * Put the file in the templates directoryBrendan Abolivier2020-03-112-19/+37
| * Update wording and configBrendan Abolivier2020-03-113-2/+8
| * ChangelogBrendan Abolivier2020-03-111-0/+1
| * Move the default SAML2 error HTML to a dedicated fileBrendan Abolivier2020-03-112-18/+55
* | Add type annotations and comments to auth handler (#7063)Patrick Cloke2020-03-123-89/+106
* | Merge pull request #7066 from matrix-org/babolivier/dummy_events_stateBrendan Abolivier2020-03-113-31/+37
|\ \ | |/ |/|
| * Refactor a bitBrendan Abolivier2020-03-111-28/+30
| * Also don't fail on aliases events in this caseBrendan Abolivier2020-03-111-1/+1
| * LintBrendan Abolivier2020-03-111-1/+5
| * ChangelogBrendan Abolivier2020-03-111-0/+1
| * Also don't filter out events sent by ignored users when checking state visibi...Brendan Abolivier2020-03-111-1/+1
| * Fix conditionBrendan Abolivier2020-03-111-1/+1
| * Don't filter out dummy events when we're checking the visibility of stateBrendan Abolivier2020-03-112-9/+8
|/
* Add options to disable setting profile info for prevent changes. (#7053)Brendan Abolivier2020-03-107-1/+398
|\
| * Update sample_config.yamlDirk Klimpel2020-03-101-1/+1
| * Update synapse/config/registration.pyDirk Klimpel2020-03-101-1/+1
| * lint, fix testsdklimpel2020-03-092-3/+5
| * updates after reviewdklimpel2020-03-097-37/+40
| * fix testsdklimpel2020-03-091-2/+2
| * lintdklimpel2020-03-091-10/+8
| * add testsdklimpel2020-03-092-3/+311
| * add disable_3pid_changesdklimpel2020-03-083-0/+21
| * lint2dklimpel2020-03-082-4/+4
| * lintdklimpel2020-03-081-4/+2
| * changelogdklimpel2020-03-084-4/+19
| * Add options to disable setting profile info for prevent changes.dklimpel2020-03-083-1/+53
* | Merge pull request #7058 from matrix-org/babolivier/saml_error_htmlBrendan Abolivier2020-03-107-6/+81
|\ \
| * | Rephrase default messageBrendan Abolivier2020-03-101-2/+2
| * | Hopefully mypy is happy nowBrendan Abolivier2020-03-102-3/+10
| * | Attempt at appeasing the gods of mypyBrendan Abolivier2020-03-101-1/+1
| * | LintBrendan Abolivier2020-03-101-1/+1
| * | ChangelogBrendan Abolivier2020-03-101-0/+1
| * | Update sample configBrendan Abolivier2020-03-101-0/+7
| * | SAML2: render a comprehensible error page if something goes wrongBrendan Abolivier2020-03-103-2/+62
|/ /
* | Merge pull request #7055 from matrix-org/babolivier/get_time_of_last_push_act...Brendan Abolivier2020-03-093-18/+21
|\ \
| * | ChangelogBrendan Abolivier2020-03-091-0/+1
| * | Fix undefined `room_id` in `make_summary_text`Brendan Abolivier2020-03-091-1/+3
| * | Move `get_time_of_last_push_action_before` to the `EventPushActionsWorkerStore`Brendan Abolivier2020-03-091-17/+17
* | | Remove special auth and redaction rules for aliases events in experimental ro...Patrick Cloke2020-03-098-22/+148
* | | Update routing of fallback auth in the worker docs. (#7048)Patrick Cloke2020-03-092-0/+2
* | | Merge pull request #7045 from matrix-org/babolivier/room_keys_checkBrendan Abolivier2020-03-092-0/+8
|\ \ \
| * | | LintBrendan Abolivier2020-03-061-2/+1
| * | | Mention the session ID in the error messageBrendan Abolivier2020-03-061-2/+3
| * | | LintBrendan Abolivier2020-03-061-1/+2
| * | | ChangelogBrendan Abolivier2020-03-061-0/+1
| * | | Make sure that is_verified is a boolean when processing room keysBrendan Abolivier2020-03-061-0/+6
| |/ /
* | | Add type hints to logging/context.py (#6309)Neil Pilgrim2020-03-072-47/+75
* | | Break down monthly active users by appservice_id (#7030)Neil Johnson2020-03-064-1/+87
|/ /
* | Convert remote key resource REST layer to async/await. (#7020)Patrick Cloke2020-03-052-7/+5
* | Store room_versions in EventBase objects (#6875)Richard van der Hoff2020-03-055-32/+63
* | Merge pull request #7035 from matrix-org/babolivier/hide_dummy_eventsBrendan Abolivier2020-03-052-0/+4
|\ \
| * | ChangelogBrendan Abolivier2020-03-041-0/+1
| * | Hide extremities dummy events from clientsBrendan Abolivier2020-03-041-0/+3
|/ /
* | Allow deleting an alias if the user has sufficient power level (#6986)Patrick Cloke2020-03-045-64/+182
* | Read the room version from database when fetching events (#6874)Richard van der Hoff2020-03-043-16/+79
* | Merge branch 'master' into developBrendan Abolivier2020-03-0314-35/+401
|\ \
| * | Update debian changelog v1.11.1 github/release-v1.11.1 release-v1.11.1Brendan Abolivier2020-03-031-0/+6
| * | Merge branch 'babolivier/v1.11.1-changelog' into 'release-v1.11.1'Brendan Abolivier2020-03-034-3/+16
| |\ \
| | * | v1.11.1Brendan Abolivier2020-03-034-3/+16
| |/ /
| * | Merge branch 'babolivier/complete_sso_login_saml' into 'release-v1.11.1'Brendan Abolivier2020-03-031-3/+2
| |\ \
| | * | Fix wrong handler being used in SAML handlerBrendan Abolivier2020-03-031-3/+2
| |/ /
| * | Merge branch 'babolivier/sso_module_api' into 'release-v1.11.1'Brendan Abolivier2020-03-034-57/+96
| |\ \
| | * | Factor out complete_sso_login and expose it to the Module APIBrendan Abolivier2020-03-034-57/+96
| |/ /
| * | Merge branch 'rav/sso-confirm-whitelist' into 'release-v1.11.1'Richard van der Hoff2020-03-024-14/+84
| |\ \
| | * | Add a whitelist for the SSO confirmation step.Richard van der Hoff2020-03-024-14/+84
| |/ /
| * | Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1Richard van der Hoff2020-03-024-38/+194
| |\ \
| * \ \ Merge branch 'anoabolivier/sso-confirm' into 'release-v1.11.1'Brendan Abolivier2020-03-027-6/+245
| |\ \ \
| | * | | Add a confirmation step to the SSO login flowBrendan Abolivier2020-03-027-6/+245
| |/ / /
* | | / Validate the alt_aliases property of canonical alias events (#6971)Patrick Cloke2020-03-038-52/+254
| |_|/ |/| |
* | | Always return a deferred from `get_current_state_deltas`. (#7019)Erik Johnston2020-03-022-1/+4
* | | Fix py35-old CI by using native tox. (#7018)Erik Johnston2020-03-022-6/+2
* | | remove spurious changelogRichard van der Hoff2020-03-021-1/+0
* | | Merge branch 'release-v1.11.1' into developRichard van der Hoff2020-03-020-0/+0
|\ \ \ | | |/ | |/|
| * | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-03-024-38/+194
| |/
* | rst->mdMatthew Hodgson2020-03-011-1/+1
* | Fix last date for ACMEv1 install (#7015)Uday Bansal2020-02-292-1/+2
* | Fix mounting of homeserver.yaml when it does not exist on host (#6913)Sandro2020-02-291-2/+1
* | Add some type annotations to the federation base & client classes (#6995)Patrick Cloke2020-02-284-28/+45
* | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-02-284-42/+199
* | Merge remote-tracking branch 'origin/release-v1.11.1' into developPatrick Cloke2020-02-272-6/+9
|\|
| * Cast a coroutine into a Deferred in the federation base (#6996)Patrick Cloke2020-02-262-6/+9
* | Don't refuse to start worker if media listener configured. (#7002)Erik Johnston2020-02-272-14/+21
* | set worker_app for frontend proxy test (#7003)Richard van der Hoff2020-02-272-0/+6
* | Expose common commands via snap run interface to allow easier invocation (#6315)James2020-02-272-5/+17
* | Add some type annotations in `synapse.storage` (#6987)Richard van der Hoff2020-02-278-84/+270
* | Store room version on invite (#6983)Richard van der Hoff2020-02-267-2/+78
* | Port PresenceHandler to async/await (#6991)Erik Johnston2020-02-267-115/+113
* | Updated warning for incorrect database collation/ctype (#6985)Uday Bansal2020-02-262-3/+8
* | Ensure 'deactivated' parameter is a boolean on user admin API, Fix error hand...Andrew Morgan2020-02-264-4/+68
* | Sanity-check database before running upgrades (#6982)Richard van der Hoff2020-02-250-0/+0
* | Sanity-check database before running upgrades (#6982)Richard van der Hoff2020-02-253-17/+33
* | Merge worker apps into one. (#6964)Erik Johnston2020-02-2516-2327/+1052
* | contrib/docker: remove quotes for POSTGRES_INITDB_ARGS (#6984)Fridtjof Mund2020-02-252-1/+2
* | Remove redundant store_room call (#6979)Richard van der Hoff2020-02-242-23/+1
* | Upsert room version when we join over federation (#6968)Richard van der Hoff2020-02-243-10/+30
* | Fix minor issues with email config (#6962)Richard van der Hoff2020-02-243-40/+36
* | No longer use room alias events to calculate room names for push notification...Patrick Cloke2020-02-212-22/+15
* | Change displayname of user as admin in rooms (#6876)Dirk Klimpel2020-02-212-1/+12
* | Stop returning aliases as part of the room list. (#6970)Patrick Cloke2020-02-212-9/+1
* | Publishing/removing from the directory requires a power level greater than ca...Patrick Cloke2020-02-212-5/+6
* | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-2173-276/+251
* | Merge pull request #6967 from matrix-org/rav/increase_max_events_behindRichard van der Hoff2020-02-212-1/+2
|\ \
| * | changelogRichard van der Hoff2020-02-211-0/+1
| * | Increase MAX_EVENTS_BEHIND for replication clientsErik Johnston2020-02-211-1/+1
* | | Merge branch 'master' into developRichard van der Hoff2020-02-215-11/+25
|\ \ \ | |/ / |/| / | |/
| * 1.11.0 v1.11.0 github/release-v1.11.0 release-v1.11.0Richard van der Hoff2020-02-214-2/+16
| * Small grammar fixes to the ACME v1 deprecation notice (#6944)Andrew Morgan2020-02-213-10/+10
* | Do not send alias events when creating / upgrading a room (#6941)Patrick Cloke2020-02-203-40/+16
* | don't insert into the device table for remote cross-signing keys (#6956)Hubert Chathi2020-02-202-15/+19
* | Add some clarifications to README.md in the database schema directory. (#6615)Ruben Barkow-Kuder2020-02-202-8/+17
* | Minor perf fixes to `get_auth_chain_ids`.Erik Johnston2020-02-193-7/+6
* | Freeze allocated objects on startup. (#6953)Erik Johnston2020-02-192-0/+10
* | Reduce auth chains fetched during v2 state res. (#6952)Erik Johnston2020-02-195-13/+39
|/
* update changes.md v1.11.0rc1Richard van der Hoff2020-02-191-6/+5
* 1.11.0rc1Richard van der Hoff2020-02-1957-56/+74
* Revert `get_auth_chain_ids` changes (#6951)Erik Johnston2020-02-192-28/+1
* Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableRichard van der Hoff2020-02-1910-86/+97
|\
| * changelogRichard van der Hoff2020-02-191-0/+1
| * Make room alias lists peekableRichard van der Hoff2020-02-192-1/+20
| * Add `allow_departed_users` param to `check_in_room_or_world_readable`Richard van der Hoff2020-02-195-15/+33
| * Refactor the membership check methods in AuthRichard van der Hoff2020-02-184-73/+46
* | Merge pull request #6940 from matrix-org/babolivier/federate.mdBrendan Abolivier2020-02-194-153/+127
|\ \
| * | Incorporate reviewBrendan Abolivier2020-02-192-12/+13
| * | Incorporate reviewBrendan Abolivier2020-02-182-21/+17
| * | PhrasingBrendan Abolivier2020-02-181-1/+1
| * | ChangelogBrendan Abolivier2020-02-181-0/+1
| * | Add mention of SRV records as an advanced topicBrendan Abolivier2020-02-181-0/+10
| * | Argh trailing spacesBrendan Abolivier2020-02-181-2/+2
| * | Fix links in the reverse proxy docBrendan Abolivier2020-02-181-3/+4
| * | Make federate.md more of a sumary of the steps to follow to set up replicationBrendan Abolivier2020-02-181-17/+28
| * | Split the delegating documentation out of federate.md and trim it downBrendan Abolivier2020-02-182-133/+87
* | | Move MSC2432 stuff onto unstable prefix (#6948)Richard van der Hoff2020-02-194-4/+23
* | | Tiny optimisation for _get_handler_for_request (#6950)Richard van der Hoff2020-02-192-1/+4
* | | Increase DB/CPU perf of `_is_server_still_joined` check. (#6936)Erik Johnston2020-02-193-15/+60
* | | Merge pull request #6945 from matrix-org/babolivier/fix-retention-debug-logBrendan Abolivier2020-02-192-1/+2
|\ \ \
| * | | Update changelog.d/6945.bugfixBrendan Abolivier2020-02-191-1/+1
| * | | ChangelogBrendan Abolivier2020-02-181-0/+1
| * | | Fix log in message retention purge jobsBrendan Abolivier2020-02-181-1/+1
* | | | Limit size of get_auth_chain_ids query (#6947)Erik Johnston2020-02-192-18/+24
| |_|/ |/| |
* | | Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Richard van der Hoff2020-02-185-11/+128
* | | Merge pull request #6872 from matrix-org/rav/dictpropertyRichard van der Hoff2020-02-183-82/+120
|\ \ \
| * | | changelogRichard van der Hoff2020-02-141-0/+1
| * | | Rewrite _EventInternalMetadata to back it with a _dictRichard van der Hoff2020-02-141-16/+39
| * | | Replace _event_dict_property with DictPropertyRichard van der Hoff2020-02-142-66/+80
* | | | Merge pull request #6907 from matrix-org/babolivier/acme-configBrendan Abolivier2020-02-184-1/+40
|\ \ \ \ | |_|/ / |/| | |
| * | | Make the log more noticeableBrendan Abolivier2020-02-181-1/+2
| * | | Print the error as an error log and raise the same exception we gotBrendan Abolivier2020-02-181-9/+10
| * | | Linters are hard but in they end they just want what's best for usBrendan Abolivier2020-02-131-1/+1
| * | | LintBrendan Abolivier2020-02-131-6/+7
| * | | ChangelogBrendan Abolivier2020-02-131-0/+1
| * | | LintBrendan Abolivier2020-02-131-7/+6
| * | | Add a separator for the config warningBrendan Abolivier2020-02-131-1/+1
| * | | Add a comprehensive error when failing to register for an ACME accountBrendan Abolivier2020-02-131-1/+13
| * | | Add mention and warning about ACME v1 deprecation to the Synapse configBrendan Abolivier2020-02-132-0/+24
* | | | Increase perf of `get_auth_chain_ids` used in state res v2. (#6937)Erik Johnston2020-02-182-0/+24
* | | | Fix worker docs to point `/publicised_groups` API correctly. (#6938)Erik Johnston2020-02-182-3/+5
* | | | Merge pull request #6909 from matrix-org/babolivier/acme-installBrendan Abolivier2020-02-182-11/+18
|\ \ \ \
| * | | | Update INSTALL.mdBrendan Abolivier2020-02-131-1/+3
| * | | | ChangelogBrendan Abolivier2020-02-131-0/+1
| * | | | Update INSTALL.md to recommend reverse proxying and warn about ACMEv1 depreca...Brendan Abolivier2020-02-131-11/+15
| | |_|/ | |/| |
* | | | Stop sending events when creating or deleting aliases (#6904)Patrick Cloke2020-02-184-42/+194
* | | | Kill off deprecated "config-on-the-fly" docker mode (#6918)Richard van der Hoff2020-02-183-40/+33
* | | | #6924 has been released in 1.10.1Richard van der Hoff2020-02-171-1/+0
* | | | Merge branch 'master' into developRichard van der Hoff2020-02-173-1/+16
|\ \ \ \
| * \ \ \ Merge branch 'release-v1.10.1'Richard van der Hoff2020-02-174-3/+21
| |\ \ \ \
| | * | | | 1.10.1 v1.10.1 github/release-v1.10.1 release-v1.10.1Richard van der Hoff2020-02-174-2/+16
| | * | | | wait for current_state_events_membership before delete_old_current_state_even...Richard van der Hoff2020-02-172-2/+6
* | | | | | Raise the default power levels for invites, tombstones and server acls (#6834)Andrew Morgan2020-02-173-2/+13
* | | | | | wait for current_state_events_membership before delete_old_current_state_even...Richard van der Hoff2020-02-172-2/+6
* | | | | | Add type hints to the spam check module (#6915)Patrick Cloke2020-02-144-22/+36
* | | | | | contrib/docker: Ensure correct encoding and locale settings on DB creation (#...Fridtjof Mund2020-02-142-0/+4
* | | | | | Add a warning about indentation to generated config (#6920)Richard van der Hoff2020-02-144-4/+29
* | | | | | Convert the directory handler tests to use HomeserverTestCase (#6919)Patrick Cloke2020-02-142-24/+18
| |_|_|_|/ |/| | | |
* | | | | Filter the results of user directory searching via the spam checker (#6888)Patrick Cloke2020-02-145-2/+135
| |_|/ / |/| | |
* | | | Update changelog for #6905 to group it with upcoming PRsBrendan Abolivier2020-02-131-1/+1
* | | | Add documentation for the spam checker module (#6906)Patrick Cloke2020-02-132-0/+86
* | | | Merge pull request #6905 from matrix-org/babolivier/acme.mdBrendan Abolivier2020-02-132-12/+44
|\ \ \ \
| * | | | Update docs/ACME.mdBrendan Abolivier2020-02-131-1/+1
| * | | | Mention that using Synapse to serve certificates requires restartsBrendan Abolivier2020-02-121-1/+3
| * | | | ChangelogBrendan Abolivier2020-02-121-0/+1
| * | | | Remove duplicated info about certbot et alBrendan Abolivier2020-02-121-5/+0
| * | | | Update ACME.md to mention ACME v1 deprecationBrendan Abolivier2020-02-121-7/+41
| | |_|/ | |/| |
* / | | Remove m.lazy_load_members from unstable features since it is in CS r0.5.0 (#...Aaron Raimist2020-02-132-1/+1
|/ / /
* | | Merge pull request #6891 from matrix-org/babolivier/retention-doc-amendBrendan Abolivier2020-02-123-0/+8
|\ \ \
| * | | RephraseBrendan Abolivier2020-02-122-5/+5
| * | | Update the changelog fileBrendan Abolivier2020-02-111-1/+1
| * | | Also spell it out in the purge history API docBrendan Abolivier2020-02-111-0/+3
| * | | ChangelogBrendan Abolivier2020-02-111-0/+1
| * | | Spell out that Synapse never purges the last event sent in a roomBrendan Abolivier2020-02-111-0/+4
* | | | Return a 404 for admin api user lookup if user not found (#6901)Andrew Morgan2020-02-123-1/+21
* | | | Merge branch 'master' into developBrendan Abolivier2020-02-125-6/+21
|\ \ \ \ | | |/ / | |/| |
| * | | Merge tag 'v1.10.0'Brendan Abolivier2020-02-1287-520/+1795
| |\ \ \ | | | |/ | | |/|
| | * | Move the warning at the top of the release changes v1.10.0 github/release-v1.10.0 release-v1.10.0Brendan Abolivier2020-02-121-3/+2
| | * | 1.10.0Brendan Abolivier2020-02-124-2/+16
| | * | bump the version of Alpine Linux used in the docker images (#6897)Richard van der Hoff2020-02-122-1/+2
| * | | Update documentation (#6859)Robin Vleij2020-02-051-1/+2
* | | | Use BSD-compatible in-place editing for sed. (#6887)Patrick Cloke2020-02-122-1/+3
| |_|/ |/| |
* | | Merge branch 'release-v1.10.0' into developRichard van der Hoff2020-02-112-5/+9
|\ \ \ | | |/ | |/|
| * | 1.10.0rc5 v1.10.0rc5Richard van der Hoff2020-02-112-2/+6
| * | changelog wordingRichard van der Hoff2020-02-111-2/+2
| * | Update CHANGES.mdRichard van der Hoff2020-02-111-1/+1
| * | changelog formattingRichard van der Hoff2020-02-111-2/+2
* | | Merge branch 'release-v1.10.0' into developRichard van der Hoff2020-02-113-1/+11
|\| |
| * | 1.10.0rc4Richard van der Hoff2020-02-113-2/+10
| * | filter out m.room.aliases from /sync state blocks (#6884)Matthew Hodgson2020-02-102-0/+2
* | | Reject device display names that are too long (#6882)Patrick Cloke2020-02-103-1/+32