Skip to content

Commit b35ec75

Browse files
jasonvargajasonvarga
committed
Merge branch '5.x'
# Conflicts: # resources/css/components/fieldtypes/assets.css # resources/js/components/assets/Editor/Editor.vue # resources/js/components/fieldtypes/assets/AssetRow.vue
2 parents 1d06e5a + 8dc69c6 commit b35ec75

File tree

41 files changed

+770
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+770
-105
lines changed

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout code
1313
uses: actions/checkout@v4

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
run: vendor/bin/phpunit
9898

9999
js-tests:
100-
runs-on: ubuntu-20.04
100+
runs-on: ubuntu-latest
101101
if: "!contains(github.event.head_commit.message, '[ci skip]')"
102102

103103
name: JavaScript tests

‎CHANGELOG.md‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
# Release Notes
22

3+
## 5.47.0 (2025-03-18)
4+
5+
### What's new
6+
- Support Sections in form GraphQL queries [#11466](https://github.com/statamic/cms/issues/11466) by @ryanmitchell
7+
- Add empty/not empty field filters [#11389](https://github.com/statamic/cms/issues/11389) by @jacksleight
8+
- Support arguments in user can/cant tags [#11407](https://github.com/statamic/cms/issues/11407) by @jacksleight
9+
- Add hook into the `multisite` command [#11458](https://github.com/statamic/cms/issues/11458) by @duncanmcclean
10+
- Set the proper CSP headers for multi-domain iframe [#11447](https://github.com/statamic/cms/issues/11447) by @edalzell
11+
- Allow custom render callback for overridden exceptions [#11408](https://github.com/statamic/cms/issues/11408) by @FrittenKeeZ
12+
- Support the Group fieldtype in DataReferenceUpdater [#11410](https://github.com/statamic/cms/issues/11410) by @duncanmcclean
13+
14+
### What's fixed
15+
- Fix emptiness check on Value properties [#11402](https://github.com/statamic/cms/issues/11402) by @godismyjudge95
16+
- Change revision whereKey to return a collection [#11463](https://github.com/statamic/cms/issues/11463) by @ryanmitchell
17+
- If nav:from references an invalid entry, ensure nothing is returned [#11464](https://github.com/statamic/cms/issues/11464) by @ryanmitchell
18+
- Improve performance of the data reference updaters [#11442](https://github.com/statamic/cms/issues/11442) by @duncanmcclean
19+
- Fix search results missing search_snippets [#11450](https://github.com/statamic/cms/issues/11450) by @ivang76
20+
- Ensure consistent order of `get_content` results [#11429](https://github.com/statamic/cms/issues/11429) by @daun
21+
- Fixes empty asset alt <td> element in AssetsFieldtype [#11460](https://github.com/statamic/cms/issues/11460) by @PatrickJunod
22+
- Fix issue with AssetsFieldtype upload controls hidden on @sm size [#11459](https://github.com/statamic/cms/issues/11459) by @PatrickJunod
23+
- Fix test state issues around sites cache [#11455](https://github.com/statamic/cms/issues/11455) by @jesseleite
24+
- Fix InstallEloquentDriver command [#11425](https://github.com/statamic/cms/issues/11425) by @aerni
25+
- Handle extra translation files in breadcrumbs [#11422](https://github.com/statamic/cms/issues/11422) by @jasonvarga
26+
- Select specific repositories for Eloquent Driver install command [#11381](https://github.com/statamic/cms/issues/11381) by @kevinmeijer97
27+
- Adjust video fit in asset editor [#11414](https://github.com/statamic/cms/issues/11414) by @daun
28+
- Dutch translations [#11448](https://github.com/statamic/cms/issues/11448) by @daronspence
29+
- Use `ubuntu-latest` in GitHub Actions workflows [#11443](https://github.com/statamic/cms/issues/11443) by @duncanmcclean
30+
31+
32+
333
## 5.46.1 (2025-02-04)
434

535
### What's fixed

‎resources/css/components/fieldtypes/assets.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
}
88

99
.assets-fieldtype .assets-fieldtype-picker {
10-
@apply flex items-center rounded border bg-gray-200 px-4 py-2 dark:border-dark-900 dark:bg-dark-650;
10+
@apply flex flex-wrap items-center rounded border bg-gray-200 px-4 py-2 dark:border-dark-900 dark:bg-dark-650;
1111

1212
&.is-expanded {
1313
@apply rounded-b-none border-b-0;
1414
}
1515

1616
.asset-upload-control {
17-
@apply mt-2 text-xs leading-tight text-gray-600 @sm:mt-0 @sm:ltr:ml-4 @sm:rtl:mr-4;
17+
@apply text-xs leading-tight text-gray-600;
1818
}
1919

2020
.upload-text-button {
@@ -30,7 +30,7 @@
3030
}
3131

3232
.assets-fieldtype .asset-upload-control {
33-
@apply hidden @xs:inline-block;
33+
@apply inline-block;
3434
}
3535

3636
/* Inside a Grid

‎resources/js/components/assets/Editor/Editor.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,7 @@
178178
</div>
179179

180180
<!-- Video -->
181-
<div class="w-full shadow-none" v-else-if="asset.isVideo">
182-
<video :src="asset.url" class="w-full" controls></video>
183-
</div>
181+
<video :src="asset.url" controls v-else-if="asset.isVideo"></video>
184182
</div>
185183
</div>
186184

‎resources/js/components/fieldtypes/assets/AssetRow.vue‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,15 @@
2929
>
3030
{{ asset.basename }}
3131
</button>
32-
<div v-text="asset.size" class="asset-filesize hidden px-2 text-xs text-gray-600 @xs:inline" />
33-
</td>
34-
<td class="w-24" v-if="showSetAlt">
3532
<button
33+
v-if="showSetAlt && needsAlt"
3634
class="asset-set-alt px-4 text-sm text-blue hover:text-black dark:text-dark-blue-100 dark:hover:text-dark-100"
3735
type="button"
3836
@click="editOrOpen"
39-
v-if="needsAlt"
4037
>
4138
{{ asset.values.alt ? '✅' : __('Set Alt') }}
4239
</button>
40+
<div v-text="asset.size" class="asset-filesize hidden px-2 text-xs text-gray-600 @xs:inline" />
4341
</td>
4442
<td class="w-8 p-0 align-middle ltr:text-right rtl:text-left" v-if="!readOnly">
4543
<button

‎resources/js/components/fieldtypes/assets/AssetsFieldtype.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<div
2626
v-if="!isReadOnly && showPicker"
27-
class="assets-fieldtype-picker space-x-4"
27+
class="assets-fieldtype-picker gap-x-4 gap-y-2"
2828
:class="{
2929
'is-expanded': expanded,
3030
'bard-drag-handle': isInBardField,

‎resources/lang/nl/markdown.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
return [
44

55
'cheatsheet' => '
6-
<p>Markdown is een text-naar-HTML markup syntax for webredacteuren. Met Markdown kun je leesbare en eenvoudige platte tekst schrijven welke geconverteerd wordt naar semantische, valide HTML.</p>
6+
<p>Markdown is een text-naar-HTML markup syntax voor webredacteuren. Met Markdown kun je leesbare en eenvoudige platte tekst schrijven welke geconverteerd wordt naar semantische, valide HTML.</p>
77
88
<h3>Headers</h3>
99
<pre class="language-markdown"><code># Dit is een h1
@@ -12,7 +12,7 @@
1212
</code></pre>
1313
1414
<h3>Bold &amp; Italic</h3>
15-
<pre class="language-markdown"><code>Je kunt dingen *benadrukken*, **bold maken**, or _**beide**_.</code></pre>
15+
<pre class="language-markdown"><code>Je kunt dingen *benadrukken*, **bold maken**, of _**beide**_.</code></pre>
1616
1717
<h3>Links</h3>
1818
<pre class="language-markdown"><code>Dit is een [voorbeeldlink](https://voorbeeld.nl).</code></pre>

‎src/Auth/UserTags.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,9 +453,10 @@ public function can()
453453
}
454454

455455
$permissions = Arr::wrap($this->params->explode(['permission', 'do']));
456+
$arguments = $this->params->except(['permission', 'do'])->all();
456457

457458
foreach ($permissions as $permission) {
458-
if ($user->can($permission)) {
459+
if ($user->can($permission, $arguments)) {
459460
return $this->parser ? $this->parse() : true;
460461
}
461462
}
@@ -477,11 +478,12 @@ public function cant()
477478
}
478479

479480
$permissions = Arr::wrap($this->params->explode(['permission', 'do']));
481+
$arguments = $this->params->except(['permission', 'do'])->all();
480482

481483
$can = false;
482484

483485
foreach ($permissions as $permission) {
484-
if ($user->can($permission)) {
486+
if ($user->can($permission, $arguments)) {
485487
$can = true;
486488
break;
487489
}

‎src/CP/Breadcrumbs.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
use JsonSerializable;
77
use Statamic\Statamic;
88

9+
use function Statamic\trans as __;
10+
911
class Breadcrumbs implements Arrayable, JsonSerializable
1012
{
1113
protected $crumbs;

0 commit comments

Comments
 (0)