diff options
| author | Andrew Morgan <andrewm@element.io> | 2022-03-22 16:31:28 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrewm@element.io> | 2022-03-22 16:31:28 +0000 |
| commit | 831d4797ab46ada7266046a9719b72ca9e5949f9 (patch) | |
| tree | cccc3ceb49b69fdd5bba91d7d106c4440fce7b57 /synapse | |
| parent | Add type hints to tests files. (#12256) (diff) | |
| parent | Changelog: sso -> Single Sign-On (diff) | |
| download | synapse-831d4797ab46ada7266046a9719b72ca9e5949f9.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/res/templates/sso_auth_account_details.html | 8 | ||||
| -rw-r--r-- | synapse/res/templates/sso_auth_account_details.js | 2 | ||||
| -rw-r--r-- | synapse/res/templates/sso_footer.html | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 870707f476..f0f224d0bb 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -68,7 +68,7 @@ try: except ImportError: pass -__version__ = "1.55.0rc1" +__version__ = "1.55.0" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when diff --git a/synapse/res/templates/sso_auth_account_details.html b/synapse/res/templates/sso_auth_account_details.html index b231aace01..1ba850369a 100644 --- a/synapse/res/templates/sso_auth_account_details.html +++ b/synapse/res/templates/sso_auth_account_details.html @@ -130,13 +130,13 @@ </head> <body> <header> - <h1>Choose your account name</h1> - <p>This is required to create your account on {{ server_name }}, and you can't change this later.</p> + <h1>Create your account</h1> + <p>This is required. Continue to create your account on {{ server_name }}. You can't change this later.</p> </header> <main> <form method="post" class="form__input" id="form"> <div class="username_input" id="username_input"> - <label for="field-username">Username</label> + <label for="field-username">Username (required)</label> <div class="prefix">@</div> <input type="text" name="username" id="field-username" value="{{ user_attributes.localpart }}" autofocus> <div class="postfix">:{{ server_name }}</div> @@ -145,7 +145,7 @@ <input type="submit" value="Continue" class="primary-button"> {% if user_attributes.avatar_url or user_attributes.display_name or user_attributes.emails %} <section class="idp-pick-details"> - <h2>{% if idp.idp_icon %}<img src="{{ idp.idp_icon | mxc_to_http(24, 24) }}"/>{% endif %}Information from {{ idp.idp_name }}</h2> + <h2>{% if idp.idp_icon %}<img src="{{ idp.idp_icon | mxc_to_http(24, 24) }}"/>{% endif %}Optional data from {{ idp.idp_name }}</h2> {% if user_attributes.avatar_url %} <label class="idp-detail idp-avatar" for="idp-avatar"> <div class="check-row"> diff --git a/synapse/res/templates/sso_auth_account_details.js b/synapse/res/templates/sso_auth_account_details.js index 3c45df9078..82438519a2 100644 --- a/synapse/res/templates/sso_auth_account_details.js +++ b/synapse/res/templates/sso_auth_account_details.js @@ -62,7 +62,7 @@ function validateUsername(username) { usernameField.parentElement.classList.remove("invalid"); usernameOutput.classList.remove("error"); if (!username) { - return reportError("Please provide a username"); + return reportError("This is required. Please provide a username"); } if (username.length > 255) { return reportError("Too long, please choose something shorter"); diff --git a/synapse/res/templates/sso_footer.html b/synapse/res/templates/sso_footer.html index 588a3d508d..b46e0d83fe 100644 --- a/synapse/res/templates/sso_footer.html +++ b/synapse/res/templates/sso_footer.html @@ -15,5 +15,5 @@ </g> </g> </svg> - <p>An open network for secure, decentralized communication.<br>© 2021 The Matrix.org Foundation C.I.C.</p> + <p>An open network for secure, decentralized communication.<br>© 2022 The Matrix.org Foundation C.I.C.</p> </footer> \ No newline at end of file |