diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f5ef6f34..f15004d96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,8 @@ ## xx/xx/201x 1. [](#bugfix) - * Fixed [#635](https://github.com/getgrav/grav/issues/635) use mv instead of rename as that does not support cross volume operations - * Add a better fix for [#635](https://github.com/getgrav/grav/issues/635), thanks @mahagr for the hint. Overwrites [#1214](https://github.com/getgrav/grav/pull/1214) + * Fixed cross volume file system operations [#635](https://github.com/getgrav/grav/issues/635) + * Fix issue with pages folders validation not accepting uppercase letters # v1.1.12 ## 12/26/2016 diff --git a/system/blueprints/pages/default.yaml b/system/blueprints/pages/default.yaml index 86302a65a..5fb9ab232 100644 --- a/system/blueprints/pages/default.yaml +++ b/system/blueprints/pages/default.yaml @@ -133,7 +133,7 @@ form: label: PLUGIN_ADMIN.FOLDER_NAME validate: type: slug - pattern: '[a-zа-я0-9_\-]+' + pattern: '[a-zA-Zа-яA-Я0-9_\-]+' route: type: select diff --git a/system/blueprints/pages/modular_new.yaml b/system/blueprints/pages/modular_new.yaml index 0a2a3817d..9e1e21319 100644 --- a/system/blueprints/pages/modular_new.yaml +++ b/system/blueprints/pages/modular_new.yaml @@ -24,7 +24,7 @@ form: validate: type: slug required: true - pattern: '[a-zа-я0-9_\-]+' + pattern: '[a-zA-Zа-яA-Я0-9_\-]+' route: type: select diff --git a/system/blueprints/pages/modular_raw.yaml b/system/blueprints/pages/modular_raw.yaml index fc61e486f..2a7b91268 100644 --- a/system/blueprints/pages/modular_raw.yaml +++ b/system/blueprints/pages/modular_raw.yaml @@ -73,7 +73,7 @@ form: validate: type: slug required: true - pattern: '[a-zа-я0-9_\-]+' + pattern: '[a-zA-Zа-яA-Я0-9_\-]+' route: type: select diff --git a/system/blueprints/pages/new.yaml b/system/blueprints/pages/new.yaml index 9f628c027..719c4bc15 100644 --- a/system/blueprints/pages/new.yaml +++ b/system/blueprints/pages/new.yaml @@ -26,7 +26,7 @@ form: validate: type: slug required: true - pattern: '[a-zа-я0-9_\-]+' + pattern: '[a-zA-Zа-яA-Я0-9_\-]+' route: type: select diff --git a/system/blueprints/pages/new_folder.yaml b/system/blueprints/pages/new_folder.yaml index 3eee46e23..d255c7bc7 100644 --- a/system/blueprints/pages/new_folder.yaml +++ b/system/blueprints/pages/new_folder.yaml @@ -19,7 +19,7 @@ form: validate: type: slug required: true - pattern: '[a-zа-я0-9_\-]+' + pattern: '[a-zA-Zа-яA-Я0-9_\-]+' route: type: select diff --git a/system/blueprints/pages/raw.yaml b/system/blueprints/pages/raw.yaml index 221460198..245a0b075 100644 --- a/system/blueprints/pages/raw.yaml +++ b/system/blueprints/pages/raw.yaml @@ -73,7 +73,7 @@ form: validate: type: slug required: true - pattern: '[a-zа-я0-9_\-]+' + pattern: '[a-zA-Zа-яA-Я0-9_\-]+' route: type: select