- Username + Username (required)

:{{ server_name }}

@@ -145,7 +145,7 @@ {% if user_attributes.avatar_url or user_attributes.display_name or user_attributes.emails %}

{% if idp.idp_icon %}{% endif %}Information from {{ idp.idp_name }}

{% if idp.idp_icon %}{% endif %}Optional data from {{ idp.idp_name }}

{% if user_attributes.avatar_url %}

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 @@ -

\ No newline at end of file -- cgit 1.4.1 From 34baf764514a5691e407678d9261c5531215b26a Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 22 Mar 2022 14:02:52 +0000 Subject: 1.55.0 --- CHANGES.md | 9 +++++++++ changelog.d/12260.misc | 1 - changelog.d/12265.misc | 1 - debian/changelog | 6 ++++++ synapse/__init__.py | 2 +- 5 files changed, 16 insertions(+), 3 deletions(-) delete mode 100644 changelog.d/12260.misc delete mode 100644 changelog.d/12265.misc (limited to 'synapse') diff --git a/CHANGES.md b/CHANGES.md index 06396c3f6f..2bb2336a29 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,12 @@ +Synapse 1.55.0 (2022-03-22) +=========================== + +Internal Changes +---------------- + +- Tweak copy for default sso account details template to better adhere to mobile app store guidelines. ([\#12265](https://github.com/matrix-org/synapse/issues/12265), [\#12260](https://github.com/matrix-org/synapse/issues/12260)) + + Synapse 1.55.0rc1 (2022-03-15) ============================== diff --git a/changelog.d/12260.misc b/changelog.d/12260.misc deleted file mode 100644 index deacf034de..0000000000 --- a/changelog.d/12260.misc +++ /dev/null @@ -1 +0,0 @@ -Reword 'Choose your user name' as 'Choose your account name' in the SSO registration template, in order to comply with SIWA guidelines. \ No newline at end of file diff --git a/changelog.d/12265.misc b/changelog.d/12265.misc deleted file mode 100644 index 4213f58555..0000000000 --- a/changelog.d/12265.misc +++ /dev/null @@ -1 +0,0 @@ -Tweak copy for default sso account details template to better adhere to mobile app store guidelines. \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 09ef24ebb0..7eed6c5b4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.55.0) stable; urgency=medium + + * New synapse release 1.55.0. + + -- Synapse Packaging team Tue, 22 Mar 2022 13:59:26 +0000 + matrix-synapse-py3 (1.55.0~rc1) stable; urgency=medium * New synapse release 1.55.0~rc1. 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 -- cgit 1.4.1