From 2d9df03766938e193a4fe46acd34ba5389264888 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Wed, 22 Feb 2023 09:16:54 -0700 Subject: [PATCH 1/3] Revert "move account info under account section" This reverts commit 1fae4504a2c17a32a91f20c29b6e33d8956f9869. --- system/blueprints/user/account.yaml | 107 ++++++++++++++-------------- 1 file changed, 53 insertions(+), 54 deletions(-) diff --git a/system/blueprints/user/account.yaml b/system/blueprints/user/account.yaml index ccc09a9f8..ef5f25b04 100644 --- a/system/blueprints/user/account.yaml +++ b/system/blueprints/user/account.yaml @@ -30,63 +30,62 @@ form: type: section title: PLUGIN_ADMIN.ACCOUNT underline: true - fields: - - username: - type: text - size: large - label: PLUGIN_ADMIN.USERNAME - disabled: true - readonly: true - - email: - type: email - size: large - label: PLUGIN_ADMIN.EMAIL - validate: - type: email - message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE - required: true - password: - type: password - size: large - label: PLUGIN_ADMIN.PASSWORD - autocomplete: new-password - validate: - required: false - message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE - config-pattern@: system.pwd_regex - - fullname: - type: text - size: large - label: PLUGIN_ADMIN.FULL_NAME - validate: - required: true - - title: - type: text - size: large - label: PLUGIN_ADMIN.TITLE + username: + type: text + size: large + label: PLUGIN_ADMIN.USERNAME + disabled: true + readonly: true - language: - type: select - label: PLUGIN_ADMIN.LANGUAGE - size: medium - classes: fancy - data-options@: '\Grav\Plugin\Admin\Admin::adminLanguages' - default: 'en' - help: PLUGIN_ADMIN.LANGUAGE_HELP + email: + type: email + size: large + label: PLUGIN_ADMIN.EMAIL + validate: + type: email + message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE + required: true + + password: + type: password + size: large + label: PLUGIN_ADMIN.PASSWORD + autocomplete: new-password + validate: + required: false + message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE + config-pattern@: system.pwd_regex + + fullname: + type: text + size: large + label: PLUGIN_ADMIN.FULL_NAME + validate: + required: true - content_editor: - type: select - label: PLUGIN_ADMIN.CONTENT_EDITOR - size: medium - classes: fancy - data-options@: 'Grav\Plugin\Admin\Admin::contentEditor' - default: 'default' - help: PLUGIN_ADMIN.CONTENT_EDITOR_HELP + title: + type: text + size: large + label: PLUGIN_ADMIN.TITLE + + language: + type: select + label: PLUGIN_ADMIN.LANGUAGE + size: medium + classes: fancy + data-options@: '\Grav\Plugin\Admin\Admin::adminLanguages' + default: 'en' + help: PLUGIN_ADMIN.LANGUAGE_HELP + + content_editor: + type: select + label: PLUGIN_ADMIN.CONTENT_EDITOR + size: medium + classes: fancy + data-options@: 'Grav\Plugin\Admin\Admin::contentEditor' + default: 'default' + help: PLUGIN_ADMIN.CONTENT_EDITOR_HELP twofa_check: type: conditional From 3b92c1aca4aed62109f6a8c4e355180f780e11c4 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Wed, 22 Feb 2023 09:19:24 -0700 Subject: [PATCH 2/3] updated changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2932c3d6d..223eb8f31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.7.39.4 +## 02/22/2023 + +1. [](#bugfix) + * Reverted a reorganization of `account.yaml` that caused username to be disabled [admin#2344](https://github.com/getgrav/grav-plugin-admin/issues/2344) + # v1.7.39.3 ## 02/21/2023 From ec115a6a6499531e4f3cb1f32159f8659dc82741 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Wed, 22 Feb 2023 09:20:07 -0700 Subject: [PATCH 3/3] prepare for release --- system/defines.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/defines.php b/system/defines.php index b343f0526..285631092 100644 --- a/system/defines.php +++ b/system/defines.php @@ -9,7 +9,7 @@ // Some standard defines define('GRAV', true); -define('GRAV_VERSION', '1.7.39.3'); +define('GRAV_VERSION', '1.7.39.4'); define('GRAV_SCHEMA', '1.7.0_2020-11-20_1'); define('GRAV_TESTING', false);