summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Only import sqlite3 when type checkingDavid Vo2020-05-281-2/+5
| | | | | Fixes: #7127 Signed-off-by: David Vo <david@vovo.id.au>
* Fix another instanceAndrew Morgan2020-05-281-5/+7
|
* Only setdefault for signatures if device has key_jsonAndrew Morgan2020-05-281-5/+7
|
* Fix starting workers when federation sending not split out.Erik Johnston2020-05-281-0/+12
|
* Config lintingAndrew Morgan2020-05-141-4/+4
|
* Remove extraneous file from mergeAndrew Morgan2020-05-141-22/+0
|
* apply lintingAndrew Morgan2020-05-1412-47/+39
|
* Temporarily add m.lazy_load_members to unstable_featuresAndrew Morgan2020-05-041-0/+3
|
* Add caches for get_profile_{displayname,avatar_url}Andrew Morgan2020-05-011-0/+3
|
* Disable _mark_expired_users_as_inactive bg job when account validity disabledAndrew Morgan2020-04-301-2/+4
|
* Ensure non-federated rooms are not shown for POST /publicRoomsAndrew Morgan2020-04-291-1/+5
|
* Disable m.id_access_token, m.require_identity_server, ↵Andrew Morgan2020-04-281-4/+4
| | | | m.separate_add_and_bind, org.matrix.e2e_cross_signing unstable_features
* Simplify auto-bind email to IS hackAndrew Morgan2020-04-242-23/+6
|
* Remove protocol scheme from email delegateAndrew Morgan2020-04-241-1/+12
| | | | This is an update to the commit ef8e78c1e623db5df97c7401bc5af9960946915e
* Remove bind_email param from dinsic-specific codeAndrew Morgan2020-04-242-3/+2
|
* HACK: Bind email to identity server when using it for 3pid delegationAndrew Morgan2020-04-242-1/+38
|
* Fix some broken referencesAndrew Morgan2020-04-242-6/+6
|
* Fix incorrect call to _map_email_to_display_nameAndrew Morgan2020-04-241-1/+1
|
* Merge branch 'dinsic-release-v1.12.x' of ↵Andrew Morgan2020-04-233-86/+82
|\ | | | | | | | | | | | | github.com:matrix-org/synapse-dinsic into dinsic-release-v1.12.x * 'dinsic-release-v1.12.x' of github.com:matrix-org/synapse-dinsic: Fix and refactor rewritten IS url feature. Add sample config docs (#40)
| * Fix and refactor rewritten IS url feature. Add sample config docs (#40)Andrew Morgan2020-04-222-85/+81
| |
* | Fix missing shadow 3pid functionAndrew Morgan2020-04-231-0/+13
|/ | | | | I think this is where the code removed in 67c6de2caa1ba0f50b11ba0b158e056391cad9c3 was supposed to go.
* Remove unnecessary shadow server codeAndrew Morgan2020-04-211-23/+0
|
* Consolidate id_server URL translationAndrew Morgan2020-04-203-35/+41
|
* Don't verify signatures using re-written id_server urlAndrew Morgan2020-04-171-8/+10
|
* await on_user_ipAndrew Morgan2020-04-161-1/+1
|
* Remove defer.returnValue call from async functionAndrew Morgan2020-04-161-1/+1
|
* Re-add third_party_rules/__init__.pyAndrew Morgan2020-04-151-0/+14
| | | | Accidentally deleted in https://github.com/matrix-org/synapse-dinsic/commit/6c058e32063b606b473f415ae6b68000f036ff94#diff-2a9df128248ff0ce75eb3f836469110a
* Merge branch 'dinsic' of github.com:matrix-org/synapse-dinsic into ↵Andrew Morgan2020-03-241-0/+22
|\ | | | | | | | | | | | | | | | | | | dinsic-release-v1.12.x * 'dinsic' of github.com:matrix-org/synapse-dinsic: Fixes an attribute error when using the default display name during registration. (#32) Share SSL contexts for non-federation requests (#30) Share SSL options for well-known requests (#29) Fix buggy condition in account validity handler (#28)
| * Fixes an attribute error when using the default display name during ↵Patrick Cloke2020-03-192-0/+24
| | | | | | | | registration. (#32)
| * Share SSL contexts for non-federation requests (#30)Richard van der Hoff2020-03-174-27/+44
| | | | | | | | | | * Share SSL contexts for non-federation requests * newsfile
| * Share SSL options for well-known requests (#29)Andrew Morgan2020-03-162-10/+13
| |
| * Fix buggy condition in account validity handler (#28)Brendan Abolivier2020-03-162-2/+8
| |
* | 1.12.0Andrew Morgan2020-03-241-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | * commit '2fa55c0cc': 1.12.0 more changelog changelog fixes fix typo
| * | 1.12.0Richard van der Hoff2020-03-231-1/+1
| | |
* | | 1.12.0rc1Andrew Morgan2020-03-241-1/+1
|\| | | | | | | | | | | | | | | | | * commit 'e43e78b98': 1.12.0rc1 update grafana dashboard
| * | 1.12.0rc1Richard van der Hoff2020-03-191-1/+1
| | |
* | | Fix concurrent modification errors in pusher metrics (#7106)Andrew Morgan2020-03-241-9/+18
|\| | | | | | | | | | | | | | * commit 'e913823a2': Fix concurrent modification errors in pusher metrics (#7106)
| * | Fix concurrent modification errors in pusher metrics (#7106)Richard van der Hoff2020-03-191-9/+18
| | | | | | | | | add a lock to try to make this metric actually work
* | | Add prometheus metrics for the number of active pushers (#7103)Andrew Morgan2020-03-243-8/+33
|\| | | | | | | | | | | | | | * commit '8c75667ad': Add prometheus metrics for the number of active pushers (#7103)
| * | Add prometheus metrics for the number of active pushers (#7103)Richard van der Hoff2020-03-193-8/+33
| | |
* | | Move pusherpool startup into _base.setup (#7104)Andrew Morgan2020-03-242-1/+1
|\| | | | | | | | | | | | | | * commit '443162e57': Move pusherpool startup into _base.setup (#7104)
| * | Move pusherpool startup into _base.setup (#7104)Richard van der Hoff2020-03-192-1/+1
| | | | | | | | | | | | | | | This should be safe to do on all workers/masters because it is guarded by a config option which will ensure it is only actually done on the worker assigned as a pusher.
* | | Improve get auth chain difference algorithm. (#7095)Andrew Morgan2020-03-243-49/+161
|\| | | | | | | | | | | | | | * commit '4a17a647a': Improve get auth chain difference algorithm. (#7095)
| * | Improve get auth chain difference algorithm. (#7095)Erik Johnston2020-03-183-49/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was originally implemented by pulling the full auth chain of all state sets out of the database and doing set comparison. However, that can take a lot work if the state and auth chains are large. Instead, lets try and fetch the auth chains at the same time and calculate the difference on the fly, allowing us to bail early if all the auth chains converge. Assuming that the auth chains do converge more often than not, this should improve performance. Hopefully.
* | | Add an option to the set password API to choose whether to logout other ↵Andrew Morgan2020-03-243-19/+33
|\| | | | | | | | | | | | | | | | | | | | devices. (#7085) * commit '88b41986d': Add an option to the set password API to choose whether to logout other devices. (#7085)
| * | Add an option to the set password API to choose whether to logout other ↵Patrick Cloke2020-03-183-19/+33
| | | | | | | | | | | | devices. (#7085)
* | | Share SSL contexts for non-federation requests (#7094)Andrew Morgan2020-03-244-31/+48
|\| | | | | | | | | | | | | | * commit 'c37db0211': Share SSL contexts for non-federation requests (#7094)
| * | Share SSL contexts for non-federation requests (#7094)Richard van der Hoff2020-03-174-31/+48
| | | | | | | | | | | | | | | | | | | | | Extends #5794 etc to the SimpleHttpClient so that it also applies to non-federation requests. Fixes #7092.
* | | Set charset to utf-8 when adding headers for certain text content types (#7044)Andrew Morgan2020-03-241-1/+24
|\| | | | | | | | | | | | | | * commit '5e477c1de': Set charset to utf-8 when adding headers for certain text content types (#7044)
| * | Set charset to utf-8 when adding headers for certain text content types (#7044)The Stranjer2020-03-171-1/+24
| | | | | | | | | | | | Fixes #7043
* | | Remove unused federation endpoint (`query_auth`) (#7026)Andrew Morgan2020-03-244-146/+79
|\| | | | | | | | | | | | | | * commit '7581d30e9': Remove unused federation endpoint (`query_auth`) (#7026)
| * | Remove unused federation endpoint (`query_auth`) (#7026)Patrick Cloke2020-03-174-146/+79
| | |
* | | Remove special casing of `m.room.aliases` events (#7034)Andrew Morgan2020-03-242-27/+1
|\| | | | | | | | | | | | | | * commit '60724c46b': Remove special casing of `m.room.aliases` events (#7034)
| * | Remove special casing of `m.room.aliases` events (#7034)Patrick Cloke2020-03-172-27/+1
| | |
* | | Merge commit '6a3504636' into dinsic-release-v1.12.xAndrew Morgan2020-03-248-144/+279
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a3504636': (29 commits) Revert "Add options to disable setting profile info for prevent changes. (#7053)" Populate the room version from state events (#7070) Fix buggy condition in account validity handler (#7074) Use innerText instead of innerHTML Add type annotations and comments to auth handler (#7063) Lint Put the file in the templates directory Update wording and config Changelog Move the default SAML2 error HTML to a dedicated file Refactor a bit Also don't fail on aliases events in this case Lint Changelog Also don't filter out events sent by ignored users when checking state visibility Fix condition Don't filter out dummy events when we're checking the visibility of state Update sample_config.yaml Update synapse/config/registration.py lint, fix tests ...
| * | Revert "Add options to disable setting profile info for prevent changes. ↵Richard van der Hoff2020-03-173-49/+0
| | | | | | | | | | | | | | | | | | | | | (#7053)" This reverts commit 54dd28621b070ca67de9f773fe9a89e1f4dc19da, reversing changes made to 6640460d054e8f4444046a34bdf638921b31c01e.
| * | Populate the room version from state events (#7070)Brendan Abolivier2020-03-162-0/+62
| | | | | | | | | | | | | | | Fixes #7065 This is basically the same as https://github.com/matrix-org/synapse/pull/6847 except it tries to populate events from `state_events` rather than `current_state_events`, since the latter might have been cleared from the state of some rooms too early, leaving them with a `NULL` room version.
| * | Fix buggy condition in account validity handler (#7074)Brendan Abolivier2020-03-161-1/+5
| | |
| * | Merge pull request #7067 from matrix-org/babolivier/saml_error_moarBrendan Abolivier2020-03-132-23/+72
| |\ \ | | | | | | | | Move the default SAML2 error HTML to a dedicated file
| | * | 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-111-12/+21
| | | |
| | * | Update wording and configBrendan Abolivier2020-03-112-2/+5
| | | |
| | * | Move the default SAML2 error HTML to a dedicated fileBrendan Abolivier2020-03-112-18/+55
| | | | | | | | | | | | | | | | | | | | Also add some JS to it to process any error we might have in the URI (see #6893).
| * | | Add type annotations and comments to auth handler (#7063)Patrick Cloke2020-03-121-89/+104
| | | |
| * | | 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
| | | |
| * | | Also don't filter out events sent by ignored users when checking state ↵Brendan Abolivier2020-03-111-1/+1
| | | | | | | | | | | | | | | | visibility
| * | | 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-103-0/+49
| |\ \
| | * | Update synapse/config/registration.pyDirk Klimpel2020-03-101-1/+1
| | | | | | | | | | | | Co-Authored-By: Brendan Abolivier <github@brendanabolivier.com>
| | * | lint, fix testsdklimpel2020-03-091-1/+3
| | | |
| | * | updates after reviewdklimpel2020-03-093-18/+24
| | | |
| | * | add disable_3pid_changesdklimpel2020-03-082-0/+16
| | | |
| | * | lint2dklimpel2020-03-081-2/+2
| | | |
| | * | lintdklimpel2020-03-081-4/+2
| | | |
| | * | changelogdklimpel2020-03-082-4/+10
| | | |
| | * | Add options to disable setting profile info for prevent changes.dklimpel2020-03-082-0/+21
| | | |
* | | | Merge pull request #7058 from matrix-org/babolivier/saml_error_htmlAndrew Morgan2020-03-245-6/+73
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6640460d0': Rephrase default message Hopefully mypy is happy now Attempt at appeasing the gods of mypy Lint Changelog Update sample config SAML2: render a comprehensible error page if something goes wrong
| * | | 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
| | | |
| * | | SAML2: render a comprehensible error page if something goes wrongBrendan Abolivier2020-03-103-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | If an error happened while processing a SAML AuthN response, or a client ends up doing a `GET` request to `/authn_response`, then render a customisable error page rather than a confusing error.
* | | | Merge pull request #7055 from ↵Andrew Morgan2020-03-242-18/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/get_time_of_last_push_action_before * commit '14b2ebe76': Changelog Fix undefined `room_id` in `make_summary_text` Move `get_time_of_last_push_action_before` to the `EventPushActionsWorkerStore`
| * | | Merge pull request #7055 from ↵Brendan Abolivier2020-03-092-18/+20
| |\ \ \ | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/get_time_of_last_push_action_before Move get_time_of_last_push_action_before to the EventPushActionsWorkerStore
| | * | | Fix undefined `room_id` in `make_summary_text`Brendan Abolivier2020-03-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | This would break notifications about un-named rooms when processing notifications in a batch.
| | * | | Move `get_time_of_last_push_action_before` to the `EventPushActionsWorkerStore`Brendan Abolivier2020-03-091-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #7054 I also had a look at the rest of the functions in `EventPushActionsStore` and in the push notifications send code and it looks to me like there shouldn't be any other method with this issue in this part of the codebase.
* | | | | Remove special auth and redaction rules for aliases events in experimental ↵Andrew Morgan2020-03-245-19/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | room ver. (#7037) * commit '06eb5cae0': Remove special auth and redaction rules for aliases events in experimental room ver. (#7037)
| * | | | Remove special auth and redaction rules for aliases events in experimental ↵Patrick Cloke2020-03-095-19/+22
| | | | | | | | | | | | | | | | | | | | room ver. (#7037)
* | | | | Merge pull request #7045 from matrix-org/babolivier/room_keys_checkAndrew Morgan2020-03-241-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bbf725e7d': Lint Mention the session ID in the error message Lint Changelog Make sure that is_verified is a boolean when processing room keys
| * | | | Merge pull request #7045 from matrix-org/babolivier/room_keys_checkBrendan Abolivier2020-03-091-0/+7
| |\ \ \ \ | | | | | | | | | | | | Make sure that is_verified is a boolean when processing room keys
| | * | | | 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
| | | | | |
| | * | | | 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)Andrew Morgan2020-03-241-47/+74
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '2bff4457d': Add type hints to logging/context.py (#6309)
| * | | | Add type hints to logging/context.py (#6309)Neil Pilgrim2020-03-071-47/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add type hints to logging/context.py Signed-off-by: neiljp (Neil Pilgrim) <github@kepier.clara.net>
* | | | | Break down monthly active users by appservice_id (#7030)Andrew Morgan2020-03-242-1/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '1d66dce83': Break down monthly active users by appservice_id (#7030)
| * | | | Break down monthly active users by appservice_id (#7030)Neil Johnson2020-03-062-1/+44
| |/ / / | | | | | | | | | | | | | | | | * Break down monthly active users by appservice_id and emit via prometheus. Co-authored-by: Brendan Abolivier <babolivier@matrix.org>
* | | | Convert remote key resource REST layer to async/await. (#7020)Andrew Morgan2020-03-241-7/+4
|\| | | | | | | | | | | | | | | | | | | * commit '87972f07e': Convert remote key resource REST layer to async/await. (#7020)
| * | | Convert remote key resource REST layer to async/await. (#7020)Patrick Cloke2020-03-051-7/+4
| | | |
* | | | Store room_versions in EventBase objects (#6875)Andrew Morgan2020-03-244-32/+62
|\| | | | | | | | | | | | | | | | | | | * commit '78a15b1f9': Store room_versions in EventBase objects (#6875)
| * | | Store room_versions in EventBase objects (#6875)Richard van der Hoff2020-03-054-32/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a bit fiddly because it all has to be done on one fell swoop: * Wherever we create a new event, pass in the room version (and check it matches the format version) * When we prune an event, use the room version of the unpruned event to create the pruned version. * When we pass an event over the replication protocol, pass the room version over alongside it, and use it when deserialising the event again.
* | | | Merge pull request #7035 from matrix-org/babolivier/hide_dummy_eventsAndrew Morgan2020-03-241-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'fe678a090': Changelog Hide extremities dummy events from clients
| * | | Hide extremities dummy events from clientsBrendan Abolivier2020-03-041-0/+3
| | | |
* | | | Allow deleting an alias if the user has sufficient power level (#6986)Andrew Morgan2020-03-242-40/+76
|\| | | | | | | | | | | | | | | | | | | * commit '13892776e': Allow deleting an alias if the user has sufficient power level (#6986)
| * | | Allow deleting an alias if the user has sufficient power level (#6986)Patrick Cloke2020-03-042-40/+76
| | | |
* | | | Read the room version from database when fetching events (#6874)Andrew Morgan2020-03-241-16/+68
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '8ef8fb2c1': Read the room version from database when fetching events (#6874) Update debian changelog
| * | | Read the room version from database when fetching events (#6874)Richard van der Hoff2020-03-041-16/+68
| | | | | | | | | | | | | | | | | | | | This is a precursor to giving EventBase objects the knowledge of which room version they belong to.
| * | | Merge branch 'master' into developBrendan Abolivier2020-03-039-34/+219
| |\ \ \
* | \ \ \ v1.11.1Andrew Morgan2020-03-249-34/+219
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fd983fad9': v1.11.1 Fix wrong handler being used in SAML handler Factor out complete_sso_login and expose it to the Module API Add a whitelist for the SSO confirmation step. Add a confirmation step to the SSO login flow
| * | | | v1.11.1Brendan Abolivier2020-03-031-1/+1
| | | | |
| * | | | Fix wrong handler being used in SAML handlerBrendan Abolivier2020-03-031-3/+2
| | | | |
| * | | | Factor out complete_sso_login and expose it to the Module APIBrendan Abolivier2020-03-034-57/+96
| | | | |
| * | | | Add a whitelist for the SSO confirmation step.Richard van der Hoff2020-03-022-8/+36
| | | | |
| * | | | Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1Richard van der Hoff2020-03-022-10/+12
| |\ \ \ \
| | * | | | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-03-022-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | Fix #6910
| * | | | | Add a confirmation step to the SSO login flowBrendan Abolivier2020-03-025-6/+126
| |/ / / /
* | | | | Validate the alt_aliases property of canonical alias events (#6971)Andrew Morgan2020-03-244-15/+62
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '7dcbc33a1': Validate the alt_aliases property of canonical alias events (#6971)
| * | | | Validate the alt_aliases property of canonical alias events (#6971)Patrick Cloke2020-03-034-15/+62
| | |/ / | |/| |
* | | | Always return a deferred from `get_current_state_deltas`. (#7019)Andrew Morgan2020-03-241-1/+3
|\| | | | | | | | | | | | | | | | | | | * commit 'b29474e0a': Always return a deferred from `get_current_state_deltas`. (#7019)
| * | | Always return a deferred from `get_current_state_deltas`. (#7019)Erik Johnston2020-03-021-1/+3
| | | | | | | | | | | | | | | | | | | | This currently causes presence notify code to log exceptions when there is no state changes to process. This doesn't actually cause any problems as we'd simply do nothing anyway.
* | | | Add some type annotations to the federation base & client classes (#6995)Andrew Morgan2020-03-242-28/+42
|\| | | | | | | | | | | | | | | | | | | * commit '12d425900': Add some type annotations to the federation base & client classes (#6995)
| * | | Add some type annotations to the federation base & client classes (#6995)Patrick Cloke2020-02-282-28/+42
| | | |
* | | | Fixed set a user as an admin with the new API (#6928)Andrew Morgan2020-03-242-10/+12
|\| | | | | | | | | | | | | | | | | | | * commit '9b06d8f8a': Fixed set a user as an admin with the new API (#6928)
| * | | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-02-282-10/+12
| | | | | | | | | | | | Fix #6910
| * | | Merge remote-tracking branch 'origin/release-v1.11.1' into developPatrick Cloke2020-02-271-6/+8
| |\| |
* | | | Don't refuse to start worker if media listener configured. (#7002)Andrew Morgan2020-03-241-14/+20
|\| | | | | | | | | | | | | | | | | | | * commit '2201bc979': Don't refuse to start worker if media listener configured. (#7002)
| * | | Don't refuse to start worker if media listener configured. (#7002)Erik Johnston2020-02-271-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead lets just warn if the worker has a media listener configured but has the media repository disabled. Previously non media repository workers would just ignore the media listener.
* | | | Add some type annotations in `synapse.storage` (#6987)Andrew Morgan2020-03-246-82/+266
|\| | | | | | | | | | | | | | | | | | | * commit '132b673db': Add some type annotations in `synapse.storage` (#6987)
| * | | Add some type annotations in `synapse.storage` (#6987)Richard van der Hoff2020-02-276-82/+266
| | | | | | | | | | | | | | | | | | | | I cracked, and added some type definitions in synapse.storage.
* | | | Store room version on invite (#6983)Andrew Morgan2020-03-244-2/+68
|\| | | | | | | | | | | | | | | | | | | * commit '3e99528f2': Store room version on invite (#6983)
| * | | Store room version on invite (#6983)Richard van der Hoff2020-02-264-2/+68
| | | | | | | | | | | | | | | | | | | | When we get an invite over federation, store the room version in the rooms table. The general idea here is that, when we pull the invite out again, we'll want to know what room_version it belongs to (so that we can later redact it if need be). So we need to store it somewhere...
* | | | Cast a coroutine into a Deferred in the federation base (#6996)Andrew Morgan2020-03-241-6/+8
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '380122866': Cast a coroutine into a Deferred in the federation base (#6996)
| * | | Cast a coroutine into a Deferred in the federation base (#6996)Patrick Cloke2020-02-261-6/+8
| | | | | | | | | | | | | | | | Properly convert a coroutine into a Deferred in federation_base to fix an error when joining a room.
* | | | Port PresenceHandler to async/await (#6991)Andrew Morgan2020-03-244-109/+99
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '1f773eec9': Port PresenceHandler to async/await (#6991)
| * | | Port PresenceHandler to async/await (#6991)Erik Johnston2020-02-264-109/+99
| | | |
* | | | Updated warning for incorrect database collation/ctype (#6985)Andrew Morgan2020-03-241-3/+7
|\| | | | | | | | | | | | | | | | | | | * commit '7728d87fd': Updated warning for incorrect database collation/ctype (#6985)
| * | | Updated warning for incorrect database collation/ctype (#6985)Uday Bansal2020-02-261-3/+7
| | | | | | | | | | | | Signed-off-by: Uday Bansal <43824981+udaybansal19@users.noreply.github.com>
* | | | Ensure 'deactivated' parameter is a boolean on user admin API, Fix error ↵Andrew Morgan2020-03-242-4/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | handling of call to deactivate user (#6990) * commit '8c75b621b': Ensure 'deactivated' parameter is a boolean on user admin API, Fix error handling of call to deactivate user (#6990)
| * | | Ensure 'deactivated' parameter is a boolean on user admin API, Fix error ↵Andrew Morgan2020-02-262-4/+8
| | | | | | | | | | | | | | | | handling of call to deactivate user (#6990)
* | | | Sanity-check database before running upgrades (#6982)Andrew Morgan2020-03-242-17/+32
|\| | | | | | | | | | | | | | | | | | | * commit 'e66f099ca': Sanity-check database before running upgrades (#6982)
| * | | Sanity-check database before running upgrades (#6982)Richard van der Hoff2020-02-252-17/+32
| | | | | | | | | | | | | | | | | | | | | | | | Some of the database deltas rely on `config.server_name` being set correctly, so we should check that it is before running the deltas. Fixes #6870.
* | | | Merge worker apps into one. (#6964)Andrew Morgan2020-03-2413-2317/+1045
|\| | | | | | | | | | | | | | | | | | | * commit 'bbf8886a0': Merge worker apps into one. (#6964)
| * | | Merge worker apps into one. (#6964)Erik Johnston2020-02-2513-2317/+1045
| | | |
* | | | Remove redundant store_room call (#6979)Andrew Morgan2020-03-241-23/+0
|\| | | | | | | | | | | | | | | | | | | * commit '691659568': Remove redundant store_room call (#6979)
| * | | Remove redundant store_room call (#6979)Richard van der Hoff2020-02-241-23/+0
| | | | | | | | | | | | | | | | | | | | `_process_received_pdu` is only called by `on_receive_pdu`, which ignores any events for unknown rooms, so this is redundant.
* | | | Upsert room version when we join over federation (#6968)Andrew Morgan2020-03-242-10/+29
|\| | | | | | | | | | | | | | | | | | | * commit 'a301934f4': Upsert room version when we join over federation (#6968)
| * | | Upsert room version when we join over federation (#6968)Richard van der Hoff2020-02-242-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is intended as a precursor to storing room versions when we receive an invite over federation, but has the happy side-effect of fixing #3374 at last. In short: change the store_room with try/except to a proper upsert which updates the right columns.
* | | | Fix minor issues with email config (#6962)Andrew Morgan2020-03-241-36/+30
|\| | | | | | | | | | | | | | | | | | | * commit '4c2ed3f20': Fix minor issues with email config (#6962)
| * | | Fix minor issues with email config (#6962)Richard van der Hoff2020-02-241-36/+30
| | | | | | | | | | | | | | | | | | | | | | | | * Give `notif_template_html`, `notif_template_text` default values (fixes #6960) * Don't complain if `smtp_host` and `smtp_port` are unset, since they have sensible defaults (fixes #6961) * Set the example for `enable_notifs` to `True`, for consistency and because it's more useful * Raise errors as ConfigError rather than RuntimeError for nicer formatting
* | | | No longer use room alias events to calculate room names for push ↵Andrew Morgan2020-03-241-22/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | notifications. (#6966) * commit 'af6c38950': No longer use room alias events to calculate room names for push notifications. (#6966)
| * | | No longer use room alias events to calculate room names for push ↵Patrick Cloke2020-02-211-22/+14
| | | | | | | | | | | | | | | | notifications. (#6966)
* | | | Change displayname of user as admin in rooms (#6876)Andrew Morgan2020-03-241-1/+11
|\| | | | | | | | | | | | | | | | | | | * commit '7b0e2d961': Change displayname of user as admin in rooms (#6876)
| * | | Change displayname of user as admin in rooms (#6876)Dirk Klimpel2020-02-211-1/+11
| | | |
* | | | Stop returning aliases as part of the room list. (#6970)Andrew Morgan2020-03-242-14/+5
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'fcf459948': Stop returning aliases as part of the room list. (#6970) Publishing/removing from the directory requires a power level greater than canonical aliases.
| * | | Stop returning aliases as part of the room list. (#6970)Patrick Cloke2020-02-211-9/+0
| | | |
| * | | Publishing/removing from the directory requires a power level greater than ↵Patrick Cloke2020-02-211-5/+5
| | | | | | | | | | | | | | | | canonical aliases.
* | | | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Andrew Morgan2020-03-2454-169/+160
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '509e381af': Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957) changelog Increase MAX_EVENTS_BEHIND for replication clients
| * | | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-2153-168/+159
| | | | | | | | | | | | | | | | Ensure good comprehension hygiene using flake8-comprehensions.
| * | | Merge pull request #6967 from matrix-org/rav/increase_max_events_behindRichard van der Hoff2020-02-211-1/+1
| |\ \ \ | | | | | | | | | | Increase MAX_EVENTS_BEHIND for replication clients
| | * | | Increase MAX_EVENTS_BEHIND for replication clientsErik Johnston2020-02-211-1/+1
| | | | |
| * | | | Merge branch 'master' into developRichard van der Hoff2020-02-212-6/+6
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
* | | | 1.11.0Andrew Morgan2020-03-241-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '9c1b83b00': 1.11.0
| * | | 1.11.0 v1.11.0 github/release-v1.11.0 release-v1.11.0Richard van der Hoff2020-02-211-1/+1
| | | |
* | | | Small grammar fixes to the ACME v1 deprecation notice (#6944)Andrew Morgan2020-03-241-5/+5
|\| | | | | | | | | | | | | | | | | | | * commit '8f6d9c4cf': Small grammar fixes to the ACME v1 deprecation notice (#6944)
| * | | Small grammar fixes to the ACME v1 deprecation notice (#6944)Andrew Morgan2020-02-211-5/+5
| | | | | | | | | | | | Some small fixes to the copy in #6907.
* | | | Do not send alias events when creating / upgrading a room (#6941)Andrew Morgan2020-03-242-40/+15
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '99eed85a7': Do not send alias events when creating / upgrading a room (#6941)
| * | | Do not send alias events when creating / upgrading a room (#6941)Patrick Cloke2020-02-202-40/+15
| | | | | | | | | | | | Stop emitting room alias update events during room creation/upgrade.
* | | | don't insert into the device table for remote cross-signing keys (#6956)Andrew Morgan2020-03-241-15/+18
|\| | | | | | | | | | | | | | | | | | | * commit 'a90d0dc5c': don't insert into the device table for remote cross-signing keys (#6956)
| * | | don't insert into the device table for remote cross-signing keys (#6956)Hubert Chathi2020-02-201-15/+18
| | | |
* | | | Add some clarifications to README.md in the database schema directory. (#6615)Andrew Morgan2020-03-243-15/+21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '4fb5f4d0c': Add some clarifications to README.md in the database schema directory. (#6615) Minor perf fixes to `get_auth_chain_ids`.
| * | | Add some clarifications to README.md in the database schema directory. (#6615)Ruben Barkow-Kuder2020-02-201-8/+16
| | | | | | | | | | | | Signed-off-by: Ruben Barkow-Kuder <github@r.z11.de>
| * | | Minor perf fixes to `get_auth_chain_ids`.Erik Johnston2020-02-192-7/+5
| | | |
* | | | Freeze allocated objects on startup. (#6953)Andrew Morgan2020-03-241-0/+9
|\| | | | | | | | | | | | | | | | | | | * commit 'fc87d2ffb': Freeze allocated objects on startup. (#6953)
| * | | Freeze allocated objects on startup. (#6953)Erik Johnston2020-02-191-0/+9
| | | | | | | | | | | | | | | | | | | | This may make gc go a bit faster as the gc will know things like caches/data stores etc. are frozen without having to check.
* | | | Reduce auth chains fetched during v2 state res. (#6952)Andrew Morgan2020-03-243-11/+34
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '2b37eabca': Reduce auth chains fetched during v2 state res. (#6952) update changes.md
| * | | Reduce auth chains fetched during v2 state res. (#6952)Erik Johnston2020-02-193-11/+34
| |/ / | | | | | | | | | | | | | | | The state res v2 algorithm only cares about the difference between auth chains, so we can pass in the known common state to the `get_auth_chain` storage function so that it can ignore those events.
* | | 1.11.0rc1Andrew Morgan2020-03-241-1/+1
|\| | | | | | | | | | | | | | * commit '197b08de3': 1.11.0rc1
| * | 1.11.0rc1Richard van der Hoff2020-02-191-1/+1
| | |
* | | Revert `get_auth_chain_ids` changes (#6951)Andrew Morgan2020-03-241-28/+0
|\| | | | | | | | | | | | | | * commit '099c96b89': Revert `get_auth_chain_ids` changes (#6951)
| * | Revert `get_auth_chain_ids` changes (#6951)Erik Johnston2020-02-191-28/+0
| | |
* | | Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableAndrew Morgan2020-03-247-84/+77
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '2fb7794e6': changelog Make room alias lists peekable Add `allow_departed_users` param to `check_in_room_or_world_readable` Refactor the membership check methods in Auth
| * | Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableRichard van der Hoff2020-02-197-84/+77
| |\ \ | | | | | | | | Make room alias lists peekable
| | * | Make room alias lists peekableRichard van der Hoff2020-02-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/pull/2432#pullrequestreview-360566830, make room alias lists accessible to users outside world_readable rooms.
| | * | Add `allow_departed_users` param to `check_in_room_or_world_readable`Richard van der Hoff2020-02-195-15/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and set it everywhere it's called. while we're here, rename it for consistency with `check_user_in_room` (and to help check that I haven't missed any instances)
| | * | Refactor the membership check methods in AuthRichard van der Hoff2020-02-183-71/+44
| | | | | | | | | | | | | | | | | | | | these were getting a bit unwieldy, so let's combine `check_joined_room` and `check_user_was_in_room` into a single `check_user_in_room`.
* | | | Move MSC2432 stuff onto unstable prefix (#6948)Andrew Morgan2020-03-242-1/+9
|\| | | | | | | | | | | | | | | | | | | * commit '880aaac1d': Move MSC2432 stuff onto unstable prefix (#6948)
| * | | Move MSC2432 stuff onto unstable prefix (#6948)Richard van der Hoff2020-02-192-1/+9
| | | | | | | | | | | | it's not in the spec yet, so needs to be unstable. Also add a feature flag for it. Also add a test for admin users.
* | | | Tiny optimisation for _get_handler_for_request (#6950)Andrew Morgan2020-03-241-1/+3
|\| | | | | | | | | | | | | | | | | | | * commit 'abf1e5c52': Tiny optimisation for _get_handler_for_request (#6950)
| * | | Tiny optimisation for _get_handler_for_request (#6950)Richard van der Hoff2020-02-191-1/+3
| | | | | | | | | | | | | | | | we have hundreds of path_regexes (see #5118), so let's not convert the same bytes to str for each of them.
* | | | Increase DB/CPU perf of `_is_server_still_joined` check. (#6936)Andrew Morgan2020-03-242-15/+59
|\| | | | | | | | | | | | | | | | | | | * commit '0d0bc3579': Increase DB/CPU perf of `_is_server_still_joined` check. (#6936)
| * | | Increase DB/CPU perf of `_is_server_still_joined` check. (#6936)Erik Johnston2020-02-192-15/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Increase DB/CPU perf of `_is_server_still_joined` check. For rooms with large amount of state a single user leaving could cause us to go and load a lot of membership events and then pull out membership state in a large number of batches. * Newsfile * Update synapse/storage/persist_events.py Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Fix adding if too soon * Update docstring * Review comments * Woops typo Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* | | | Merge pull request #6945 from matrix-org/babolivier/fix-retention-debug-logAndrew Morgan2020-03-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e4a43855': Update changelog.d/6945.bugfix Changelog Fix log in message retention purge jobs
| * | | Merge pull request #6945 from matrix-org/babolivier/fix-retention-debug-logBrendan Abolivier2020-02-191-1/+1
| |\ \ \ | | | | | | | | | | Fix log in message retention purge jobs
| | * | | Fix log in message retention purge jobsBrendan Abolivier2020-02-181-1/+1
| | | | |
* | | | | Limit size of get_auth_chain_ids query (#6947)Andrew Morgan2020-03-241-18/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '5a5abd55e': Limit size of get_auth_chain_ids query (#6947)
| * | | | Limit size of get_auth_chain_ids query (#6947)Erik Johnston2020-02-191-18/+23
| | |/ / | |/| |
* | | | Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Andrew Morgan2020-03-242-1/+39
|\| | | | | | | | | | | | | | | | | | | * commit 'adfaea8c6': Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)
| * | | Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Richard van der Hoff2020-02-182-1/+39
| | | | | | | | | | | | | | | | | | | | per matrix-org/matrix-doc#2432
* | | | Merge pull request #6872 from matrix-org/rav/dictpropertyAndrew Morgan2020-03-241-81/+118
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f1cd1479': changelog Rewrite _EventInternalMetadata to back it with a _dict Replace _event_dict_property with DictProperty
| * | | Merge pull request #6872 from matrix-org/rav/dictpropertyRichard van der Hoff2020-02-181-81/+118
| |\ \ \ | | | | | | | | | | Rewrite _EventInternalMetadata to back it with a dict
| | * | | Rewrite _EventInternalMetadata to back it with a _dictRichard van der Hoff2020-02-141-16/+39
| | | | | | | | | | | | | | | | | | | | Mostly, this gives mypy an easier time.
| | * | | Replace _event_dict_property with DictPropertyRichard van der Hoff2020-02-141-65/+79
| | | | | | | | | | | | | | | | | | | | | | | | | this amounts to the same thing, but replaces `_event_dict` with `_dict`, and removes some of the function layers generated by `property`.
* | | | | Merge pull request #6907 from matrix-org/babolivier/acme-configAndrew Morgan2020-03-242-1/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd484126bf': Make the log more noticeable Print the error as an error log and raise the same exception we got Linters are hard but in they end they just want what's best for us Lint Changelog Lint Add a separator for the config warning Add a comprehensive error when failing to register for an ACME account Add mention and warning about ACME v1 deprecation to the Synapse config
| * | | | Merge pull request #6907 from matrix-org/babolivier/acme-configBrendan Abolivier2020-02-182-1/+34
| |\ \ \ \ | | |_|/ / | |/| | | Add mention and warning about ACME v1 deprecation to the TLS config
| | * | | 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
| | | | |
| | * | | 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-131-0/+19
| | | | |
* | | | | Increase perf of `get_auth_chain_ids` used in state res v2. (#6937)Andrew Morgan2020-03-241-0/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '8a380d0fe': Increase perf of `get_auth_chain_ids` used in state res v2. (#6937)
| * | | | Increase perf of `get_auth_chain_ids` used in state res v2. (#6937)Erik Johnston2020-02-181-0/+23
| | | | | | | | | | | | | | | We do this by moving the recursive query to be fully in the DB.
* | | | | Stop sending events when creating or deleting aliases (#6904)Andrew Morgan2020-03-242-40/+41
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe3941f6e': Stop sending events when creating or deleting aliases (#6904)
| * | | | Stop sending events when creating or deleting aliases (#6904)Patrick Cloke2020-02-182-40/+41
| | | | | | | | | | | | | | | Stop sending events when creating or deleting associations (room aliases). Send an updated canonical alias event if one of the alt_aliases is deleted.
| * | | | Merge branch 'master' into developRichard van der Hoff2020-02-171-1/+1
| |\ \ \ \
* | \ \ \ \ 1.10.1Andrew Morgan2020-03-231-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit 'fd6d83ed9': 1.10.1
| * | | | | 1.10.1 v1.10.1 github/release-v1.10.1 release-v1.10.1Richard van der Hoff2020-02-171-1/+1
| | | | | |
| * | | | | wait for current_state_events_membership before ↵Richard van der Hoff2020-02-171-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | delete_old_current_state_events (#6924)
* | | | | | Raise the default power levels for invites, tombstones and server acls (#6834)Andrew Morgan2020-03-231-1/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '3404ad289': Raise the default power levels for invites, tombstones and server acls (#6834)
| * | | | | Raise the default power levels for invites, tombstones and server acls (#6834)Andrew Morgan2020-02-171-1/+9
| | | | | |
* | | | | | wait for current_state_events_membership before ↵Andrew Morgan2020-03-231-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delete_old_current_state_events (#6924) * commit '46fa66bbf': wait for current_state_events_membership before delete_old_current_state_events (#6924)
| * | | | | wait for current_state_events_membership before ↵Richard van der Hoff2020-02-171-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | delete_old_current_state_events (#6924)
* | | | | | Add type hints to the spam check module (#6915)Andrew Morgan2020-03-232-38/+50
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '10027c80b': Add type hints to the spam check module (#6915)
| * | | | | Add type hints to the spam check module (#6915)Patrick Cloke2020-02-142-22/+34
| | | | | | | | | | | | | | | | | | | | | | | | Add typing information to the spam checker modules.
* | | | | | Add a warning about indentation to generated config (#6920)Andrew Morgan2020-03-231-2/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97a42bbc3': Add a warning about indentation to generated config (#6920)
| * | | | | Add a warning about indentation to generated config (#6920)Richard van der Hoff2020-02-141-2/+14
| | |_|/ / | |/| | | | | | | | Fixes #6916.
* | | | | Have ThirdPartyEventRules return True on successAndrew Morgan2020-03-231-1/+3
| | | | |
* | | | | Filter the results of user directory searching via the spam checker (#6888)Andrew Morgan2020-03-233-3/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '49f877d32': Filter the results of user directory searching via the spam checker (#6888)
| * | | | Filter the results of user directory searching via the spam checker (#6888)Patrick Cloke2020-02-142-2/+39
| | | | | | | | | | | | | | | Add a method to the spam checker to filter the user directory results.
* | | | | Remove m.lazy_load_members from unstable features since it is in CS r0.5.0 ↵Andrew Morgan2020-03-231-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6877) * commit 'dc3f99870': Remove m.lazy_load_members from unstable features since it is in CS r0.5.0 (#6877)
| * | | | Remove m.lazy_load_members from unstable features since it is in CS r0.5.0 ↵Aaron Raimist2020-02-131-1/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | (#6877) Fixes #5528
* | | | Return a 404 for admin api user lookup if user not found (#6901)Andrew Morgan2020-03-231-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd8994942f': Return a 404 for admin api user lookup if user not found (#6901) Move the warning at the top of the release changes
| * | | Return a 404 for admin api user lookup if user not found (#6901)Andrew Morgan2020-02-121-1/+4
| | | |
| * | | Merge branch 'master' into developBrendan Abolivier2020-02-121-1/+1
| |\| |
| * | | Merge branch 'release-v1.10.0' into developRichard van der Hoff2020-02-111-1/+1
| |\ \ \
| * \ \ \ Merge branch 'release-v1.10.0' into developRichard van der Hoff2020-02-112-1/+2
| |\ \ \ \
* | \ \ \ \ 1.10.0Andrew Morgan2020-03-231-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit 'fdb816713': 1.10.0
| * | | | | 1.10.0Brendan Abolivier2020-02-121-1/+1
| | |_|/ / | |/| | |
* | | | | 1.10.0rc5Andrew Morgan2020-03-231-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '856b2a955': 1.10.0rc5 changelog wording Update CHANGES.md changelog formatting
| * | | | 1.10.0rc5 v1.10.0rc5Richard van der Hoff2020-02-111-1/+1
| | |/ / | |/| |
* | | | 1.10.0rc4Andrew Morgan2020-03-231-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '3edc65dd2': 1.10.0rc4
| * | | 1.10.0rc4Richard van der Hoff2020-02-111-1/+1
| | | |
* | | | Reject device display names that are too long (#6882)Andrew Morgan2020-03-231-1/+13
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'a92e703ab': Reject device display names that are too long (#6882)