Skip to content

Commit

Permalink
Merge pull request #6696 from getkirby/release/5.0.0-alpha.3
Browse files Browse the repository at this point in the history
5.0.0-alpha.3
  • Loading branch information
bastianallgeier authored Sep 23, 2024
2 parents af1da17 + 920373e commit b1b3f44
Show file tree
Hide file tree
Showing 35 changed files with 229 additions and 128 deletions.
10 changes: 5 additions & 5 deletions 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": "5.0.0-alpha.2",
"version": "5.0.0-alpha.3",
"keywords": [
"kirby",
"cms",
Expand Down Expand Up @@ -38,15 +38,15 @@
"ext-openssl": "*",
"christian-riesen/base32": "1.6.0",
"claviska/simpleimage": "4.2.0",
"composer/semver": "3.4.2",
"composer/semver": "3.4.3",
"filp/whoops": "2.15.4",
"getkirby/composer-installer": "^1.2.1",
"laminas/laminas-escaper": "2.13.0",
"michelf/php-smartypants": "1.8.1",
"phpmailer/phpmailer": "6.9.1",
"symfony/polyfill-intl-idn": "1.30.0",
"symfony/polyfill-mbstring": "1.30.0",
"symfony/yaml": "7.1.4"
"symfony/polyfill-intl-idn": "1.31.0",
"symfony/polyfill-mbstring": "1.31.0",
"symfony/yaml": "7.1.5"
},
"replace": {
"symfony/polyfill-php72": "*"
Expand Down
61 changes: 30 additions & 31 deletions composer.lock

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

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/css/style.min.css

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions panel/dist/img/icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion panel/dist/js/index.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion panel/dist/js/vendor.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions panel/dist/ui/AudioFilePreview.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"description":"File view preview for audio files","tags":{"since":[{"description":"5.0.0","title":"since"}]},"displayName":"AudioFilePreview","props":[{"name":"details","type":{"name":"array"}},{"name":"url","type":{"name":"string"}}],"component":"k-audio-file-preview","sourceFile":"src/components/Views/Files/AudioFilePreview.vue"}
1 change: 1 addition & 0 deletions panel/dist/ui/DefaultFilePreview.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"description":"General file view preview for files","tags":{"since":[{"description":"5.0.0","title":"since"}]},"displayName":"DefaultFilePreview","props":[{"name":"details","type":{"name":"array"}},{"name":"image","type":{"name":"object"},"defaultValue":{"value":"{}"}}],"component":"k-default-file-preview","sourceFile":"src/components/Views/Files/DefaultFilePreview.vue"}
2 changes: 1 addition & 1 deletion panel/dist/ui/FieldsSection.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"displayName":"FieldsSection","description":"","tags":{},"props":[{"name":"blueprint","type":{"name":"string"}},{"name":"lock","type":{"name":"boolean|object"}},{"name":"help","type":{"name":"string"}},{"name":"name","type":{"name":"string"}},{"name":"parent","type":{"name":"string"}},{"name":"timestamp","type":{"name":"number"}}],"component":"k-fields-section","sourceFile":"src/components/Sections/FieldsSection.vue"}
{"displayName":"FieldsSection","description":"","tags":{},"props":[{"name":"blueprint","type":{"name":"string"}},{"name":"lock","type":{"name":"boolean|object"}},{"name":"help","type":{"name":"string"}},{"name":"name","type":{"name":"string"}},{"name":"parent","type":{"name":"string"}},{"name":"timestamp","type":{"name":"number"}},{"name":"content","type":{"name":"object"}}],"events":[{"name":"input"},{"name":"submit"}],"component":"k-fields-section","sourceFile":"src/components/Sections/FieldsSection.vue"}
2 changes: 1 addition & 1 deletion panel/dist/ui/FilePreview.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"displayName":"FilePreview","description":"","tags":{},"props":[{"name":"details","type":{"name":"array"},"defaultValue":{"value":"[]"}},{"name":"focus","type":{"name":"object"}},{"name":"focusable","type":{"name":"boolean"}},{"name":"image","type":{"name":"object"},"defaultValue":{"value":"{}"}},{"name":"url","type":{"name":"string"}}],"events":[{"name":"focus","type":{"names":["undefined"]}}],"component":"k-file-preview","sourceFile":"src/components/Views/Files/FilePreview.vue"}
{"description":"Wrapper for file view previews","tags":{"since":[{"description":"5.0.0","title":"since"}]},"displayName":"FilePreview","props":[{"name":"component","type":{"name":"string"}},{"name":"content","type":{"name":"object"}},{"name":"props","type":{"name":"object"}}],"events":[{"name":"input"},{"name":"submit"}],"component":"k-file-preview","sourceFile":"src/components/Views/Files/FilePreview.vue"}
1 change: 1 addition & 0 deletions panel/dist/ui/FilePreviewDetails.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"description":"","tags":{"since":[{"description":"5.0.0","title":"since"}]},"displayName":"FilePreviewDetails","props":[{"name":"details","type":{"name":"array"},"defaultValue":{"value":"[]"}}],"slots":[{"name":"default"}],"component":"k-file-preview-details","sourceFile":"src/components/Views/Files/FilePreviewDetails.vue"}
1 change: 1 addition & 0 deletions panel/dist/ui/FilePreviewFrame.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"description":"","tags":{"since":[{"description":"5.0.0","title":"since"}]},"displayName":"FilePreviewFrame","props":[{"name":"options","type":{"name":"array"},"defaultValue":{"value":"[]"}}],"events":[{"name":"action"}],"slots":[{"name":"default"}],"component":"k-file-preview-frame","sourceFile":"src/components/Views/Files/FilePreviewFrame.vue"}
2 changes: 1 addition & 1 deletion panel/dist/ui/FormButtons.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"displayName":"FormButtons","description":"","tags":{},"component":"k-form-buttons","sourceFile":"src/components/Forms/FormButtons.vue"}
{"displayName":"FormButtons","description":"","tags":{},"events":[{"name":"discard"},{"name":"submit"}],"component":"k-form-buttons","sourceFile":"src/components/Forms/FormButtons.vue"}
1 change: 1 addition & 0 deletions panel/dist/ui/ImageFilePreview.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"description":"File view preview for image files","tags":{"since":[{"description":"5.0.0","title":"since"}]},"displayName":"ImageFilePreview","props":[{"name":"content","type":{"name":"object"}},{"name":"details","type":{"name":"array"}},{"name":"focusable","type":{"name":"boolean"}},{"name":"image","type":{"name":"object"},"defaultValue":{"value":"{}"}},{"name":"url","type":{"name":"string"}}],"events":[{"name":"focus"},{"name":"input","type":{"names":["undefined"]}}],"component":"k-image-file-preview","sourceFile":"src/components/Views/Files/ImageFilePreview.vue"}
2 changes: 1 addition & 1 deletion panel/dist/ui/Sections.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"displayName":"Sections","description":"","tags":{},"props":[{"name":"empty","type":{"name":"string"}},{"name":"blueprint","type":{"name":"string"}},{"name":"lock","type":{"name":"boolean|object"}},{"name":"parent","type":{"name":"string"}},{"name":"tab","type":{"name":"object"}}],"events":[{"name":"submit"}],"component":"k-sections","sourceFile":"src/components/Sections/Sections.vue"}
{"displayName":"Sections","description":"","tags":{},"props":[{"name":"blueprint","type":{"name":"string"}},{"name":"content","type":{"name":"object"}},{"name":"empty","type":{"name":"string"}},{"name":"lock","type":{"name":"boolean|object"}},{"name":"parent","type":{"name":"string"}},{"name":"tab","type":{"name":"object"}}],"events":[{"name":"input"},{"name":"submit"}],"component":"k-sections","sourceFile":"src/components/Sections/Sections.vue"}
1 change: 1 addition & 0 deletions panel/dist/ui/VideoFilePreview.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"description":"File view preview for video files","tags":{"since":[{"description":"5.0.0","title":"since"}]},"displayName":"VideoFilePreview","props":[{"name":"details","type":{"name":"array"}},{"name":"url","type":{"name":"string"}}],"component":"k-video-file-preview","sourceFile":"src/components/Views/Files/VideoFilePreview.vue"}
2 changes: 1 addition & 1 deletion panel/src/components/Misc/OfflineWarning.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div v-if="$panel.isOffline" class="k-offline-warning">
<div v-if="!$panel.system.isLocal && $panel.isOffline" class="k-offline-warning">
<p><k-icon type="bolt" /> {{ $t("error.offline") }}</p>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/Cms/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ public function impersonate(string|null $who = null): User|null
'id' => 'nobody',
'role' => 'nobody',
]),
default => $this->kirby->users()->find($who) ?? throw new NotFoundException(message: 'The user "' . $who . '" cannot be found')
default => $this->kirby->users()->find($who) ?? throw new NotFoundException(message: 'The user "' . $who . '" cannot be found'),
};
}

Expand Down
2 changes: 1 addition & 1 deletion src/Content/PlainTextContentStorageHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ public function exists(VersionId $versionId, Language $language): bool
// @codeCoverageIgnoreStart
default => throw new LogicException(
message: 'Cannot determine existence for model type "' . $this->model::CLASS_ALIAS . '"'
)
)
// @codeCoverageIgnoreEnd
};
}
Expand Down
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
2 changes: 1 addition & 1 deletion tests/Text/KirbyTagsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public function testParseWithExceptionDebug3()
'undefined' => [
'html' => fn () => throw new InvalidArgumentException(
message: 'Undefined tag type: undefined'
)
)
]
];

Expand Down
Loading

0 comments on commit b1b3f44

Please sign in to comment.