Skip to content

Commit 80fcd8b

Browse files
authored
Merge branch 'filamentphp:3.x' into fix-parent-component-dehydrate-state-when-hidden
2 parents 30a6bcd + 12ac6fc commit 80fcd8b

File tree

42 files changed

+1986
-437
lines changed

Some content is hidden

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

42 files changed

+1986
-437
lines changed

.github/FUNDING.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github: [danharrin, zepfietje]
1+
github: [danharrin]
22
polar: filamentphp

composer.lock

Lines changed: 126 additions & 125 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs-assets/app/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs-assets/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"autoprefixer": "^10.4.7",
1212
"laravel-vite-plugin": "^0.7.2",
1313
"postcss": "^8.4.14",
14-
"postcss-nesting": "^12.0.1",
14+
"postcss-nesting": "^13.0.0",
1515
"tailwindcss": "^3.4.0",
1616
"vite": "^4.5.5"
1717
}

docs-assets/app/resources/css/app.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
@tailwind base;
22
@tailwind components;
33
@tailwind utilities;
4+
@tailwind variants;

package-lock.json

Lines changed: 1213 additions & 241 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252
"mime": "^4.0.4",
5353
"npm-run-all": "^4.1.5",
5454
"postcss": "^8.4.4",
55-
"postcss-nesting": "^12.0.1",
55+
"postcss-nesting": "^13.0.0",
5656
"prettier": "^3.1.1",
5757
"prettier-plugin-blade": "v2.0.0",
58-
"prettier-plugin-tailwindcss": "^0.5.10",
58+
"prettier-plugin-tailwindcss": "^0.6.8",
5959
"pusher-js": "^7.4.0",
6060
"sortablejs": "^1.15.0",
6161
"tailwindcss": "^3.4.0",

packages/actions/docs/01-installation.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ Add Tailwind's CSS layers to your `resources/css/app.css`:
7373
@tailwind base;
7474
@tailwind components;
7575
@tailwind utilities;
76+
@tailwind variants;
7677
```
7778

7879
Create a `postcss.config.js` file in the root of your project and register Tailwind CSS, PostCSS Nesting and Autoprefixer as plugins:

packages/actions/resources/lang/es/view.php

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

55
'single' => [
66

7-
'label' => 'Vista',
7+
'label' => 'Ver',
88

99
'modal' => [
1010

packages/actions/resources/lang/uk/import.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,15 @@
1111
'form' => [
1212

1313
'file' => [
14+
1415
'label' => 'Файл',
16+
1517
'placeholder' => 'Завантажити CSV-файл',
18+
19+
'rules' => [
20+
'duplicate_columns' => '{0} Файл не повинен містити більше ніж один пустий заголовок стовпця.|{1,*} Файл не повинен містити повторюваних заголовків стовпців: :columns.',
21+
],
22+
1623
],
1724

1825
'columns' => [
@@ -72,6 +79,7 @@
7279
'file_name' => 'import-:import_id-:csv_name-failed-rows',
7380
'error_header' => 'Помилка',
7481
'system_error' => 'Системна помилка, зверніться до служби підтримки.',
82+
'column_mapping_required_for_new_record' => 'Стовпчик :attribute не було зіставлено зі стовпчиком у файлі, але він необхідний для створення нових записів.',
7583
],
7684

7785
];

0 commit comments

Comments
 (0)