Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set require: true on image block location field #6818

Open
wants to merge 4 commits into
base: develop-patch
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "The Kirby core",
"license": "proprietary",
"type": "kirby-cms",
"version": "4.4.0",
"version": "4.4.1",
"keywords": [
"kirby",
"cms",
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions config/blocks/image/image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ fields:
location:
label: field.blocks.image.location
type: radio
required: true
columns: 2
default: "kirby"
options:
Expand Down
10 changes: 5 additions & 5 deletions i18n/translations/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@
"error.form.notSaved": "항목을 저장할 수 없습니다.",

"error.language.code": "올바른 언어 코드를 입력하세요.",
"error.language.create.permission": "You are not allowed to create a language",
"error.language.delete.permission": "You are not allowed to delete the language",
"error.language.create.permission": "언어를 등록할 권한이 없습니다.",
"error.language.delete.permission": "언어를 삭제할 권한이 없습니다.",
"error.language.duplicate": "이미 등록한 언어입니다.",
"error.language.name": "올바른 언어명을 입력하세요.",
"error.language.notFound": "언어를 찾을 수 없습니다.",
"error.language.update.permission": "You are not allowed to update the language",
"error.language.update.permission": "언어를 변경할 권한이 없습니다.",

"error.layout.validation.block": "레이아웃({layoutIndex})의 특정 블록 유형({fieldset})을 사용하는 블록({blockIndex})의 특정 필드({field})에 오류가 있습니다.",
"error.layout.validation.settings": "레이아웃({index}) 옵션을 확인하세요.",
Expand Down Expand Up @@ -620,8 +620,8 @@
"stats.empty": "관련 기록이 없습니다.",
"status": "상태",

"system.info.copy": "Copy info",
"system.info.copied": "System info copied",
"system.info.copy": "정보 복사",
"system.info.copied": "시스템 정보가 복사되었습니다.",
"system.issues.content": "<code>/content</code> 폴더의 권한을 확인하세요.",
"system.issues.eol.kirby": "설치된 Kirby 버전이 만료되었습니다. 더 이상 보안 업데이트를 받을 수 없습니다.",
"system.issues.eol.plugin": "설치된 플러그인({plugin}의 지원이 종료되었습니다. 더 이상 보안 업데이트를 받을 수 없습니다.",
Expand Down
2 changes: 1 addition & 1 deletion panel/dist/js/index.min.js

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions tests/Filesystem/FilenameTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ public function testGrayscale($prop, $value, $expected)

/**
* @covers ::name
* @covers ::sanitizeName
*/
public function testName()
{
Expand All @@ -299,6 +300,7 @@ public function testName()

/**
* @covers ::name
* @covers ::sanitizeName
*/
public function testNameSanitization()
{
Expand All @@ -308,6 +310,7 @@ public function testNameSanitization()

/**
* @covers ::name
* @covers ::sanitizeName
*/
public function testNameSanitizationWithLanguageRules()
{
Expand Down
12 changes: 6 additions & 6 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php return array(
'root' => array(
'name' => 'getkirby/cms',
'pretty_version' => '4.4.0',
'version' => '4.4.0.0',
'reference' => NULL,
'pretty_version' => '4.4.1',
'version' => '4.4.1.0',
'reference' => null,
'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand Down Expand Up @@ -47,9 +47,9 @@
'dev_requirement' => false,
),
'getkirby/cms' => array(
'pretty_version' => '4.4.0',
'version' => '4.4.0.0',
'reference' => NULL,
'pretty_version' => '4.4.1',
'version' => '4.4.1.0',
'reference' => null,
'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand Down