From 34fcb78683ece63ac18d27eba2f71e5cb27d0d90 Mon Sep 17 00:00:00 2001 From: Tom Janssen Date: Sun, 24 Mar 2024 01:10:29 +0100 Subject: [PATCH 01/13] change margin application --- .../notifications/resources/views/notification.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/notifications/resources/views/notification.blade.php b/packages/notifications/resources/views/notification.blade.php index dc6ddd3ef2..761575e13b 100644 --- a/packages/notifications/resources/views/notification.blade.php +++ b/packages/notifications/resources/views/notification.blade.php @@ -80,13 +80,13 @@ @endif @if (filled($date = $getDate())) - + filled($title)])> {{ $date }} @endif @if (filled($body = $getBody())) - + filled($title) || filled($date)])> {{ str($body)->sanitizeHtml()->toHtmlString() }} @endif @@ -94,7 +94,7 @@ @if ($actions = $getActions()) filled($title) || filled($date) || filled($body)]) /> @endif From a42b0cf829c86cd94afd79cf4fd4afbedaca209a Mon Sep 17 00:00:00 2001 From: Tom Janssen Date: Sun, 24 Mar 2024 01:17:34 +0100 Subject: [PATCH 02/13] apply code style --- .../notifications/resources/views/notification.blade.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/notifications/resources/views/notification.blade.php b/packages/notifications/resources/views/notification.blade.php index 761575e13b..c1e60d520d 100644 --- a/packages/notifications/resources/views/notification.blade.php +++ b/packages/notifications/resources/views/notification.blade.php @@ -80,13 +80,17 @@ @endif @if (filled($date = $getDate())) - filled($title)])> + filled($title)]) + > {{ $date }} @endif @if (filled($body = $getBody())) - filled($title) || filled($date)])> + filled($title) || filled($date)]) + > {{ str($body)->sanitizeHtml()->toHtmlString() }} @endif From 41bb820dc37eda3585d3eabea7444c5abb362743 Mon Sep 17 00:00:00 2001 From: Andrew Weir Date: Sat, 23 Mar 2024 23:03:50 -0400 Subject: [PATCH 03/13] Update 02-listing-records.md If using the static prefix you get the following error `Cannot make non static method Filament\Resources\Pages\ListRecords::table() static in class` Making non static works --- packages/panels/docs/03-resources/02-listing-records.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/panels/docs/03-resources/02-listing-records.md b/packages/panels/docs/03-resources/02-listing-records.md index 8bbfc27d25..4a2e04d983 100644 --- a/packages/panels/docs/03-resources/02-listing-records.md +++ b/packages/panels/docs/03-resources/02-listing-records.md @@ -135,7 +135,7 @@ Although you can [customize the Eloquent query for the entire resource](getting- use Filament\Tables\Table; use Illuminate\Database\Eloquent\Builder; -public static function table(Table $table): Table +public function table(Table $table): Table { return $table ->modifyQueryUsing(fn (Builder $query) => $query->withoutGlobalScopes()); From 2e487e3bb99365a18935ca93df55d14e8c71467e Mon Sep 17 00:00:00 2001 From: corean Date: Sun, 24 Mar 2024 17:42:44 +0900 Subject: [PATCH 04/13] - Update Korean translations --- packages/actions/resources/lang/ko/export.php | 77 +++ packages/actions/resources/lang/ko/import.php | 77 +++ .../forms/resources/lang/ko/components.php | 43 ++ .../forms/resources/lang/ko/validation.php | 10 + .../resources/lang/ko/components.php | 33 +- .../resources/lang/ko/pages/dashboard.php | 26 + .../lang/ko/components/pagination.php | 8 + .../lang/ko/filters/query-builder.php | 482 ++++++++++++++++++ packages/tables/resources/lang/ko/table.php | 11 + 9 files changed, 765 insertions(+), 2 deletions(-) create mode 100644 packages/actions/resources/lang/ko/export.php create mode 100644 packages/actions/resources/lang/ko/import.php create mode 100644 packages/forms/resources/lang/ko/validation.php create mode 100644 packages/tables/resources/lang/ko/filters/query-builder.php diff --git a/packages/actions/resources/lang/ko/export.php b/packages/actions/resources/lang/ko/export.php new file mode 100644 index 0000000000..0636d1750f --- /dev/null +++ b/packages/actions/resources/lang/ko/export.php @@ -0,0 +1,77 @@ + '내보내기', + + 'modal' => [ + + 'heading' => ':label 내보내기', + + 'form' => [ + + 'columns' => [ + + 'label' => '열', + + 'form' => [ + + 'is_enabled' => [ + 'label' => ':column 활성화됨', + ], + + 'label' => [ + 'label' => ':column 라벨', + ], + + ], + + ], + + ], + + 'actions' => [ + + 'export' => [ + 'label' => '내보내기', + ], + + ], + + ], + + 'notifications' => [ + + 'completed' => [ + + 'title' => '내보내기 완료', + + 'actions' => [ + + 'download_csv' => [ + 'label' => '.csv 다운로드', + ], + + 'download_xlsx' => [ + 'label' => '.xlsx 다운로드', + ], + + ], + + ], + + 'max_rows' => [ + 'title' => '내보내기가 너무 큽니다', + 'body' => '한 번에 1개 이상의 행을 내보낼 수 없습니다.|한 번에 :count개 이상의 행을 내보낼 수 없습니다.', + ], + + 'started' => [ + 'title' => '내보내기 시작됨', + 'body' => '내보내기가 시작되었으며 1개의 행이 백그라운드에서 처리됩니다.|내보내기가 시작되었으며 :count개의 행이 백그라운드에서 처리됩니다.', + ], + + ], + + 'file_name' => '내보내기-:export_id-:model', + +]; diff --git a/packages/actions/resources/lang/ko/import.php b/packages/actions/resources/lang/ko/import.php new file mode 100644 index 0000000000..5c597dd22d --- /dev/null +++ b/packages/actions/resources/lang/ko/import.php @@ -0,0 +1,77 @@ + '가져오기', + + 'modal' => [ + + 'heading' => ':label 가져오기', + + 'form' => [ + + 'file' => [ + 'label' => '파일', + 'placeholder' => 'CSV 파일 업로드', + ], + + 'columns' => [ + 'label' => '열', + 'placeholder' => '열을 선택하세요', + ], + + ], + + 'actions' => [ + + 'download_example' => [ + 'label' => '예시 CSV 파일 다운로드', + ], + + 'import' => [ + 'label' => '가져오기', + ], + + ], + + ], + + 'notifications' => [ + + 'completed' => [ + + 'title' => '가져오기 완료', + + 'actions' => [ + + 'download_failed_rows_csv' => [ + 'label' => '실패한 행에 대한 정보 다운로드|실패한 행에 대한 정보 다운로드', + ], + + ], + + ], + + 'max_rows' => [ + 'title' => '업로드된 CSV 파일이 너무 큽니다.', + 'body' => '한 번에 1개 이상의 행을 가져올 수 없습니다.|한 번에 :count개 이상의 행을 가져올 수 없습니다.', + ], + + 'started' => [ + 'title' => '가져오기가 시작되었습니다.', + 'body' => '가져오기가 시작되었으며 1개의 행이 백그라운드에서 처리됩니다.|가져오기가 시작되었으며 :count개의 행이 백그라운드에서 처리됩니다.', + ], + + ], + + 'example_csv' => [ + 'file_name' => ':importer-example', + ], + + 'failure_csv' => [ + 'file_name' => 'import-:import_id-:csv_name-failed-rows', + 'error_header' => '오류', + 'system_error' => '시스템 오류입니다. 지원팀에 문의하세요.', + ], + +]; diff --git a/packages/forms/resources/lang/ko/components.php b/packages/forms/resources/lang/ko/components.php index 11f6e0d78e..707571a5c5 100644 --- a/packages/forms/resources/lang/ko/components.php +++ b/packages/forms/resources/lang/ko/components.php @@ -185,6 +185,15 @@ return [ ], + 'svg' => [ + + 'messages' => [ + 'confirmation' => 'SVG 파일을 편집하는 것은 크기 조정 시 품질 손실이 발생할 수 있으므로 권장되지 않습니다.\n 계속하시겠습니까?', + 'disabled' => 'SVG 파일 편집은 크기 조정 시 품질 손실이 발생할 수 있으므로 비활성화되었습니다.', + ], + + ], + ], ], @@ -241,6 +250,15 @@ return [ ], + 'radio' => [ + + 'boolean' => [ + 'true' => '예', + 'false' => '아니오', + ], + + ], + 'repeater' => [ 'actions' => [ @@ -401,6 +419,31 @@ return [ 'placeholder' => '새 태그', ], + 'text_input' => [ + + 'actions' => [ + + 'hide_password' => [ + 'label' => '비밀번호 숨기기', + ], + + 'show_password' => [ + 'label' => '비밀번호 표시', + ], + + ], + + ], + + 'toggle_buttons' => [ + + 'boolean' => [ + 'true' => '예', + 'false' => '아니오', + ], + + ], + 'wizard' => [ 'actions' => [ diff --git a/packages/forms/resources/lang/ko/validation.php b/packages/forms/resources/lang/ko/validation.php new file mode 100644 index 0000000000..45c1ef95fe --- /dev/null +++ b/packages/forms/resources/lang/ko/validation.php @@ -0,0 +1,10 @@ + [ + 'must_be_selected' => ':attribute 필드 중 하나 이상을 선택해야 합니다.', + 'only_one_must_be_selected' => ':attribute 필드 중 하나만 선택해야 합니다.', + ], + +]; diff --git a/packages/infolists/resources/lang/ko/components.php b/packages/infolists/resources/lang/ko/components.php index e79a58ac3f..330e08f5fb 100644 --- a/packages/infolists/resources/lang/ko/components.php +++ b/packages/infolists/resources/lang/ko/components.php @@ -2,8 +2,37 @@ return [ - 'text_entry' => [ - 'more_list_items' => ':count 항목이 더 있습니다', + 'entries' => [ + + 'text' => [ + + 'actions' => [ + 'collapse_list' => ':count 개 더 접기', + 'expand_list' => ':count 개 더 펼치기', + ], + + 'more_list_items' => '그리고 :count 개 더', + + ], + + 'key_value' => [ + + 'columns' => [ + + 'key' => [ + 'label' => '키', + ], + + 'value' => [ + 'label' => '값', + ], + + ], + + 'placeholder' => '항목 없음', + + ], + ], ]; diff --git a/packages/panels/resources/lang/ko/pages/dashboard.php b/packages/panels/resources/lang/ko/pages/dashboard.php index fb9e3339bb..29caec7f70 100644 --- a/packages/panels/resources/lang/ko/pages/dashboard.php +++ b/packages/panels/resources/lang/ko/pages/dashboard.php @@ -4,4 +4,30 @@ return [ 'title' => '대시보드', + 'actions' => [ + + 'filter' => [ + + 'label' => '필터', + + 'modal' => [ + + 'heading' => '필터', + + 'actions' => [ + + 'apply' => [ + + 'label' => '적용', + + ], + + ], + + ], + + ], + + ], + ]; diff --git a/packages/support/resources/lang/ko/components/pagination.php b/packages/support/resources/lang/ko/components/pagination.php index 88f03cb6d1..466bd688d5 100644 --- a/packages/support/resources/lang/ko/components/pagination.php +++ b/packages/support/resources/lang/ko/components/pagination.php @@ -22,10 +22,18 @@ return [ 'actions' => [ + 'first' => [ + 'label' => '첫 페이지', + ], + 'go_to_page' => [ 'label' => ':page 페이지로 이동', ], + 'last' => [ + 'label' => '마지막 페이지', + ], + 'next' => [ 'label' => '다음', ], diff --git a/packages/tables/resources/lang/ko/filters/query-builder.php b/packages/tables/resources/lang/ko/filters/query-builder.php new file mode 100644 index 0000000000..8827c99ce7 --- /dev/null +++ b/packages/tables/resources/lang/ko/filters/query-builder.php @@ -0,0 +1,482 @@ + '쿼리 빌더', + + 'form' => [ + + 'operator' => [ + 'label' => '연산자', + ], + + 'or_groups' => [ + + 'label' => '그룹', + + 'block' => [ + 'label' => '배타적 논리 (OR)', + 'or' => '또는', + ], + + ], + + 'rules' => [ + + 'label' => '조건', + + 'item' => [ + 'and' => '그리고', + ], + + ], + + ], + + 'no_rules' => '(조건 없음)', + + 'item_separators' => [ + 'and' => '그리고', + 'or' => '또는', + ], + + 'operators' => [ + + 'is_filled' => [ + + 'label' => [ + 'direct' => '채워짐', + 'inverse' => '빈 값', + ], + + 'summary' => [ + 'direct' => ':attribute이(가) 채워짐', + 'inverse' => ':attribute이(가) 비어 있음', + ], + + ], + + 'boolean' => [ + + 'is_true' => [ + + 'label' => [ + 'direct' => '참', + 'inverse' => '거짓', + ], + + 'summary' => [ + 'direct' => ':attribute이(가) 참', + 'inverse' => ':attribute이(가) 거짓', + ], + + ], + + ], + + 'date' => [ + + 'is_after' => [ + + 'label' => [ + 'direct' => '이후', + 'inverse' => '이후가 아님', + ], + + 'summary' => [ + 'direct' => ':attribute이(가) :date 이후', + 'inverse' => ':attribute이(가) :date 이후가 아님', + ], + + ], + + 'is_before' => [ + + 'label' => [ + 'direct' => '이전', + 'inverse' => '이전이 아님', + ], + + 'summary' => [ + 'direct' => ':attribute이(가) :date 이전', + 'inverse' => ':attribute이(가) :date 이전이 아님', + ], + + ], + + 'is_date' => [ + + 'label' => [ + 'direct' => '날짜임', + 'inverse' => '날짜가 아님', + ], + + 'summary' => [ + 'direct' => ':attribute이(가) :date임', + 'inverse' => ':attribute이(가) :date가 아님', + ], + + ], + + 'is_month' => [ + + 'label' => [ + 'direct' => '월임', + 'inverse' => '월이 아님', + ], + + 'summary' => [ + 'direct' => ':attribute이(가) :month임', + 'inverse' => ':attribute이(가) :month가 아님', + ], + + ], + + 'is_year' => [ + + 'label' => [ + 'direct' => '년도임', + 'inverse' => '년도가 아님', + ], + + 'summary' => [ + 'direct' => ':attribute이(가) :year임', + 'inverse' => ':attribute이(가) :year가 아님', + ], + + ], + + 'form' => [ + + 'date' => [ + 'label' => '날짜', + ], + + 'month' => [ + 'label' => '월', + ], + + 'year' => [ + 'label' => '년도', + ], + + ], + + ], + + 'number' => [ + + 'equals' => [ + + 'label' => [ + 'direct' => '같음', + 'inverse' => '같지 않음', + ], + + 'summary' => [ + 'direct' => ':attribute이(가) :number와 같음', + 'inverse' => ':attribute이(가) :number와 같지 않음', + ], + + ], + + 'is_max' => [ + + 'label' => [ + 'direct' => '최대값임', + 'inverse' => '보다 큼', + ], + + 'summary' => [ + 'direct' => ':attribute이(가) 최대값 :number임', + 'inverse' => ':attribute이(가) :number보다 큼', + ], + + ], + + 'is_min' => [ + + 'label' => [ + 'direct' => '최소값임', + 'inverse' => '보다 작음', + ], + + 'summary' => [ + 'direct' => ':attribute이(가) 최소값 :number임', + 'inverse' => ':attribute이(가) :number보다 작음', + ], + + ], + + 'aggregates' => [ + + 'average' => [ + 'label' => '평균', + 'summary' => ':attribute의 평균', + ], + + 'max' => [ + 'label' => '최대값', + 'summary' => ':attribute의 최대값', + ], + + 'min' => [ + 'label' => '최소값', + 'summary' => ':attribute의 최소값', + ], + + 'sum' => [ + 'label' => '합계', + 'summary' => ':attribute의 합계', + ], + + ], + + 'form' => [ + + 'aggregate' => [ + 'label' => '집계', + ], + + 'number' => [ + 'label' => '숫자', + ], + + ], + + ], + + 'relationship' => [ + + 'equals' => [ + + 'label' => [ + 'direct' => '포함함', + 'inverse' => '포함하지 않음', + ], + + 'summary' => [ + 'direct' => ':count :relationship을(를) 가짐', + 'inverse' => ':count :relationship을(를) 가지지 않음', + ], + + ], + + 'has_max' => [ + + 'label' => [ + 'direct' => '최대값을 가짐', + 'inverse' => '보다 많음', + ], + + 'summary' => [ + 'direct' => '최대값 :count :relationship을(를) 가짐', + 'inverse' => ':count보다 많은 :relationship을(를) 가짐', + ], + + ], + + 'has_min' => [ + + 'label' => [ + 'direct' => '최소값을 가짐', + 'inverse' => '보다 작음', + ], + + 'summary' => [ + 'direct' => '최소값 :count :relationship을(를) 가짐', + 'inverse' => ':count보다 작은 :relationship을(를) 가짐', + ], + + ], + + 'is_empty' => [ + + 'label' => [ + 'direct' => '비어 있음', + 'inverse' => '비어 있지 않음', + ], + + 'summary' => [ + 'direct' => ':relationship이(가) 비어 있음', + 'inverse' => ':relationship이(가) 비어 있지 않음', + ], + + ], + + 'is_related_to' => [ + + 'label' => [ + + 'single' => [ + 'direct' => '일치함', + 'inverse' => '일치하지 않음', + ], + + 'multiple' => [ + 'direct' => '포함함', + 'inverse' => '포함하지 않음', + ], + + ], + + 'summary' => [ + + 'single' => [ + 'direct' => ':relationship이(가) :values와 일치함', + 'inverse' => ':relationship이(가) :values와 일치하지 않음', + ], + + 'multiple' => [ + 'direct' => ':relationship이(가) :values를 포함함', + 'inverse' => ':relationship이(가) :values를 포함하지 않음', + ], + + 'values_glue' => [ + 0 => ', ', + 'final' => ' 또는 ', + ], + + ], + + 'form' => [ + + 'value' => [ + 'label' => '값', + ], + + 'values' => [ + 'label' => '값들', + ], + + ], + + ], + + 'form' => [ + + 'count' => [ + 'label' => '개수', + ], + + ], + + ], + + 'select' => [ + + 'is' => [ + + 'label' => [ + 'direct' => '일치함', + 'inverse' => '일치하지 않음', + ], + + 'summary' => [ + 'direct' => ':attribute이(가) :values와 일치함', + 'inverse' => ':attribute이(가) :values와 일치하지 않음', + 'values_glue' => [ + ', ', + 'final' => ' 또는 ', + ], + ], + + 'form' => [ + + 'value' => [ + 'label' => '값', + ], + + 'values' => [ + 'label' => '값들', + ], + + ], + + ], + + ], + + 'text' => [ + + 'contains' => [ + + 'label' => [ + 'direct' => '포함함', + 'inverse' => '포함하지 않음', + ], + + 'summary' => [ + 'direct' => ':attribute이(가) :text를 포함함', + 'inverse' => ':attribute이(가) :text를 포함하지 않음', + ], + + ], + + 'ends_with' => [ + + 'label' => [ + 'direct' => '끝이 일치함', + 'inverse' => '끝이 일치하지 않음', + ], + + 'summary' => [ + 'direct' => ':attribute이(가) :text로 끝남', + 'inverse' => ':attribute이(가) :text로 끝나지 않음', + ], + + ], + + 'equals' => [ + + 'label' => [ + 'direct' => '같음', + 'inverse' => '같지 않음', + ], + + 'summary' => [ + 'direct' => ':attribute이(가) :text와 같음', + 'inverse' => ':attribute이(가) :text와 같지 않음', + ], + + ], + + 'starts_with' => [ + + 'label' => [ + 'direct' => '시작함', + 'inverse' => '시작하지 않음', + ], + + 'summary' => [ + 'direct' => ':attribute이(가) :text로 시작함', + 'inverse' => ':attribute이(가) :text로 시작하지 않음', + ], + + ], + + 'form' => [ + + 'text' => [ + 'label' => '텍스트', + ], + + ], + + ], + + ], + + 'actions' => [ + + 'add_rule' => [ + 'label' => '조건 추가', + ], + + 'add_rule_group' => [ + 'label' => '조건 그룹 추가', + ], + + ], + +]; diff --git a/packages/tables/resources/lang/ko/table.php b/packages/tables/resources/lang/ko/table.php index 833f58cc2f..6ae4cfd7d1 100644 --- a/packages/tables/resources/lang/ko/table.php +++ b/packages/tables/resources/lang/ko/table.php @@ -11,7 +11,14 @@ return [ 'columns' => [ 'text' => [ + + 'actions' => [ + 'collapse_list' => ':count 개 더 접기', + 'expand_list' => ':count 개 더 펼치기', + ], + 'more_list_items' => ':count 항목이 더 있습니다', + ], ], @@ -106,6 +113,10 @@ return [ 'actions' => [ + 'apply' => [ + 'label' => '필터 적용', + ], + 'remove' => [ 'label' => '필터 삭제', ], From aa86a6c9743be1235e0c98de82e1c6a2766a190c Mon Sep 17 00:00:00 2001 From: Ngo Quoc Dat Date: Sun, 24 Mar 2024 16:04:23 +0700 Subject: [PATCH 05/13] Update vi translations --- .../support/resources/lang/vi/components/pagination.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/support/resources/lang/vi/components/pagination.php b/packages/support/resources/lang/vi/components/pagination.php index 73daf5cdf7..86f365d998 100644 --- a/packages/support/resources/lang/vi/components/pagination.php +++ b/packages/support/resources/lang/vi/components/pagination.php @@ -22,10 +22,19 @@ return [ 'actions' => [ + 'first' => [ + 'label' => 'Đầu tiên', + ], + 'go_to_page' => [ 'label' => 'Đi tới trang :page', ], + + 'last' => [ + 'label' => 'Cuối cùng', + ], + 'next' => [ 'label' => 'Tiếp theo', ], From 9a16f7df19ea9e261e91ecabdc88cace8fc64f0f Mon Sep 17 00:00:00 2001 From: Zep Fietje Date: Sun, 24 Mar 2024 15:33:25 +0100 Subject: [PATCH 06/13] Fix attributes/properties order --- .../panels/resources/views/components/tenant-menu.blade.php | 2 +- .../resources/views/components/dropdown/index.blade.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/panels/resources/views/components/tenant-menu.blade.php b/packages/panels/resources/views/components/tenant-menu.blade.php index 8f550eab83..a0885680c9 100644 --- a/packages/panels/resources/views/components/tenant-menu.blade.php +++ b/packages/panels/resources/views/components/tenant-menu.blade.php @@ -30,8 +30,8 @@ 10.5.13", + "phpunit/phpunit": ">10.5.15", "sebastian/exporter": "<5.1.0", "webmozart/assert": "<1.11.0" }, @@ -5248,7 +5248,7 @@ ], "support": { "issues": "https://github.com/pestphp/pest/issues", - "source": "https://github.com/pestphp/pest/tree/v2.34.4" + "source": "https://github.com/pestphp/pest/tree/v2.34.5" }, "funding": [ { @@ -5260,7 +5260,7 @@ "type": "github" } ], - "time": "2024-03-14T19:44:18+00:00" + "time": "2024-03-22T08:44:19+00:00" }, { "name": "pestphp/pest-plugin", @@ -5972,16 +5972,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.26.0", + "version": "1.27.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" + "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", - "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/86e4d5a4b036f8f0be1464522f4c6b584c452757", + "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757", "shasum": "" }, "require": { @@ -6013,22 +6013,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.27.0" }, - "time": "2024-02-23T16:05:55+00:00" + "time": "2024-03-21T13:14:53+00:00" }, { "name": "phpstan/phpstan", - "version": "1.10.62", + "version": "1.10.65", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9" + "reference": "3c657d057a0b7ecae19cb12db446bbc99d8839c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd5c8a1660ed3540b211407c77abf4af193a6af9", - "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3c657d057a0b7ecae19cb12db446bbc99d8839c6", + "reference": "3c657d057a0b7ecae19cb12db446bbc99d8839c6", "shasum": "" }, "require": { @@ -6077,7 +6077,7 @@ "type": "tidelift" } ], - "time": "2024-03-13T12:27:20+00:00" + "time": "2024-03-23T10:30:26+00:00" }, { "name": "phpunit/php-code-coverage", @@ -6402,16 +6402,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.13", + "version": "10.5.15", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7" + "reference": "86376e05e8745ed81d88232ff92fee868247b07b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/20a63fc1c6db29b15da3bd02d4b6cf59900088a7", - "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/86376e05e8745ed81d88232ff92fee868247b07b", + "reference": "86376e05e8745ed81d88232ff92fee868247b07b", "shasum": "" }, "require": { @@ -6483,7 +6483,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.13" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.15" }, "funding": [ { @@ -6499,7 +6499,7 @@ "type": "tidelift" } ], - "time": "2024-03-12T15:37:41+00:00" + "time": "2024-03-22T04:17:47+00:00" }, { "name": "pimple/pimple", @@ -7825,16 +7825,16 @@ }, { "name": "sebastian/environment", - "version": "6.0.1", + "version": "6.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951" + "reference": "8074dbcd93529b357029f5cc5058fd3e43666984" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/43c751b41d74f96cbbd4e07b7aec9675651e2951", - "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984", + "reference": "8074dbcd93529b357029f5cc5058fd3e43666984", "shasum": "" }, "require": { @@ -7849,7 +7849,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "6.0-dev" + "dev-main": "6.1-dev" } }, "autoload": { @@ -7877,7 +7877,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", "security": "https://github.com/sebastianbergmann/environment/security/policy", - "source": "https://github.com/sebastianbergmann/environment/tree/6.0.1" + "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0" }, "funding": [ { @@ -7885,7 +7885,7 @@ "type": "github" } ], - "time": "2023-04-11T05:39:26+00:00" + "time": "2024-03-23T08:47:14+00:00" }, { "name": "sebastian/exporter", @@ -8752,16 +8752,16 @@ }, { "name": "spatie/laravel-medialibrary", - "version": "11.4.5", + "version": "11.4.6", "source": { "type": "git", "url": "https://github.com/spatie/laravel-medialibrary.git", - "reference": "b27eb3f233cf802b1f2620fdfc34b4b13926c6d7" + "reference": "a6002b04b4a2e3227b3d5996ad78f8d73302db24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/b27eb3f233cf802b1f2620fdfc34b4b13926c6d7", - "reference": "b27eb3f233cf802b1f2620fdfc34b4b13926c6d7", + "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/a6002b04b4a2e3227b3d5996ad78f8d73302db24", + "reference": "a6002b04b4a2e3227b3d5996ad78f8d73302db24", "shasum": "" }, "require": { @@ -8844,7 +8844,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-medialibrary/issues", - "source": "https://github.com/spatie/laravel-medialibrary/tree/11.4.5" + "source": "https://github.com/spatie/laravel-medialibrary/tree/11.4.6" }, "funding": [ { @@ -8856,20 +8856,20 @@ "type": "github" } ], - "time": "2024-03-04T09:34:47+00:00" + "time": "2024-03-19T14:17:05+00:00" }, { "name": "spatie/laravel-package-tools", - "version": "1.16.3", + "version": "1.16.4", "source": { "type": "git", "url": "https://github.com/spatie/laravel-package-tools.git", - "reference": "59db18c2e20d49a0b6d447bb1c654f6c123beb9e" + "reference": "ddf678e78d7f8b17e5cdd99c0c3413a4a6592e53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/59db18c2e20d49a0b6d447bb1c654f6c123beb9e", - "reference": "59db18c2e20d49a0b6d447bb1c654f6c123beb9e", + "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/ddf678e78d7f8b17e5cdd99c0c3413a4a6592e53", + "reference": "ddf678e78d7f8b17e5cdd99c0c3413a4a6592e53", "shasum": "" }, "require": { @@ -8908,7 +8908,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-package-tools/issues", - "source": "https://github.com/spatie/laravel-package-tools/tree/1.16.3" + "source": "https://github.com/spatie/laravel-package-tools/tree/1.16.4" }, "funding": [ { @@ -8916,7 +8916,7 @@ "type": "github" } ], - "time": "2024-03-07T07:35:57+00:00" + "time": "2024-03-20T07:29:11+00:00" }, { "name": "spatie/laravel-ray", @@ -10117,23 +10117,23 @@ }, { "name": "symfony/html-sanitizer", - "version": "v6.4.4", + "version": "v7.0.4", "source": { "type": "git", "url": "https://github.com/symfony/html-sanitizer.git", - "reference": "83e1dc8b49345e078cfa21bd4c563dfa99c5ed63" + "reference": "a8543ad56bc5250378ca44bb3988516fcb073c5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/html-sanitizer/zipball/83e1dc8b49345e078cfa21bd4c563dfa99c5ed63", - "reference": "83e1dc8b49345e078cfa21bd4c563dfa99c5ed63", + "url": "https://api.github.com/repos/symfony/html-sanitizer/zipball/a8543ad56bc5250378ca44bb3988516fcb073c5d", + "reference": "a8543ad56bc5250378ca44bb3988516fcb073c5d", "shasum": "" }, "require": { "ext-dom": "*", "league/uri": "^6.5|^7.0", "masterminds/html5": "^2.7.2", - "php": ">=8.1" + "php": ">=8.2" }, "type": "library", "autoload": { @@ -10166,7 +10166,7 @@ "sanitizer" ], "support": { - "source": "https://github.com/symfony/html-sanitizer/tree/v6.4.4" + "source": "https://github.com/symfony/html-sanitizer/tree/v7.0.4" }, "funding": [ { @@ -10182,7 +10182,7 @@ "type": "tidelift" } ], - "time": "2024-02-13T16:25:19+00:00" + "time": "2024-02-15T11:33:06+00:00" }, { "name": "symfony/http-foundation", @@ -12600,16 +12600,16 @@ }, { "name": "zbateson/mb-wrapper", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/zbateson/mb-wrapper.git", - "reference": "faf35dddfacfc5d4d5f9210143eafd7a7fe74334" + "reference": "09a8b77eb94af3823a9a6623dcc94f8d988da67f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zbateson/mb-wrapper/zipball/faf35dddfacfc5d4d5f9210143eafd7a7fe74334", - "reference": "faf35dddfacfc5d4d5f9210143eafd7a7fe74334", + "url": "https://api.github.com/repos/zbateson/mb-wrapper/zipball/09a8b77eb94af3823a9a6623dcc94f8d988da67f", + "reference": "09a8b77eb94af3823a9a6623dcc94f8d988da67f", "shasum": "" }, "require": { @@ -12620,7 +12620,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": "*", "phpstan/phpstan": "*", - "phpunit/phpunit": "<=9.0" + "phpunit/phpunit": "<10.0" }, "suggest": { "ext-iconv": "For best support/performance", @@ -12657,7 +12657,7 @@ ], "support": { "issues": "https://github.com/zbateson/mb-wrapper/issues", - "source": "https://github.com/zbateson/mb-wrapper/tree/1.2.0" + "source": "https://github.com/zbateson/mb-wrapper/tree/1.2.1" }, "funding": [ { @@ -12665,7 +12665,7 @@ "type": "github" } ], - "time": "2023-01-11T23:05:44+00:00" + "time": "2024-03-18T04:31:04+00:00" }, { "name": "zbateson/stream-decorators", @@ -12742,5 +12742,5 @@ "composer-runtime-api": "^2.1" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From e8a661fe8cfcab48b18ebb09bed07b6eb3c683eb Mon Sep 17 00:00:00 2001 From: Zep Fietje Date: Sun, 24 Mar 2024 15:46:21 +0100 Subject: [PATCH 09/13] Fix formatting --- packages/support/resources/lang/vi/components/pagination.php | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/support/resources/lang/vi/components/pagination.php b/packages/support/resources/lang/vi/components/pagination.php index 86f365d998..ec92087cd7 100644 --- a/packages/support/resources/lang/vi/components/pagination.php +++ b/packages/support/resources/lang/vi/components/pagination.php @@ -30,7 +30,6 @@ return [ 'label' => 'Đi tới trang :page', ], - 'last' => [ 'label' => 'Cuối cùng', ], From af9defc7d1f5d4a9d5cc13280e046180537c567f Mon Sep 17 00:00:00 2001 From: Zep Fietje Date: Sun, 24 Mar 2024 15:51:50 +0100 Subject: [PATCH 10/13] Clean up --- .../resources/views/notification.blade.php | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/notifications/resources/views/notification.blade.php b/packages/notifications/resources/views/notification.blade.php index c1e60d520d..55a772d282 100644 --- a/packages/notifications/resources/views/notification.blade.php +++ b/packages/notifications/resources/views/notification.blade.php @@ -4,6 +4,12 @@ $color = $getColor() ?? 'gray'; $isInline = $isInline(); + $title = $getTitle(); + $hasTitle = filled($title); + $date = $getDate(); + $hasDate = filled($date); + $body = $getBody(); + $hasBody = filled($body); @endphp - @if (filled($title = $getTitle())) + @if ($hasTitle) {{ str($title)->sanitizeHtml()->toHtmlString() }} @endif - @if (filled($date = $getDate())) - filled($title)]) - > + @if ($hasDate) + $hasTitle])> {{ $date }} @endif - @if (filled($body = $getBody())) + @if ($hasBody) filled($title) || filled($date)]) + @class(['mt-1' => $hasTitle || $hasDate]) > {{ str($body)->sanitizeHtml()->toHtmlString() }} @@ -98,7 +102,7 @@ @if ($actions = $getActions()) filled($title) || filled($date) || filled($body)]) + @class(['mt-3' => $hasTitle || $hasDate || $hasBody]) /> @endif From 3487a028f1eb8e10d6bd919ea28f5f39a9d55fa7 Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Mon, 25 Mar 2024 08:53:40 +0000 Subject: [PATCH 11/13] Revert "Update 02-listing-records.md" --- packages/panels/docs/03-resources/02-listing-records.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/panels/docs/03-resources/02-listing-records.md b/packages/panels/docs/03-resources/02-listing-records.md index 4a2e04d983..8bbfc27d25 100644 --- a/packages/panels/docs/03-resources/02-listing-records.md +++ b/packages/panels/docs/03-resources/02-listing-records.md @@ -135,7 +135,7 @@ Although you can [customize the Eloquent query for the entire resource](getting- use Filament\Tables\Table; use Illuminate\Database\Eloquent\Builder; -public function table(Table $table): Table +public static function table(Table $table): Table { return $table ->modifyQueryUsing(fn (Builder $query) => $query->withoutGlobalScopes()); From dc0317ed6ffe3ef86a4cf60b16cd0f9dbb85057d Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Mon, 25 Mar 2024 08:57:04 +0000 Subject: [PATCH 12/13] Update notification.blade.php --- .../notifications/resources/views/notification.blade.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/notifications/resources/views/notification.blade.php b/packages/notifications/resources/views/notification.blade.php index 55a772d282..34b76f2f11 100644 --- a/packages/notifications/resources/views/notification.blade.php +++ b/packages/notifications/resources/views/notification.blade.php @@ -1,6 +1,8 @@ @php + use Filament\Notifications\Livewire\Notifications; use Filament\Support\Enums\Alignment; use Filament\Support\Enums\VerticalAlignment; + use Illuminate\Support\Arr; $color = $getColor() ?? 'gray'; $isInline = $isInline(); @@ -15,9 +17,9 @@