malhuda/laravel
1
0
Fork 0
mirror of https://github.com/laravel/laravel.git synced 2025-02-20 11:53:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '9.x'

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Dries Vints 2022-11-23 11:33:07 +01:00
commit 9fb954fb90
No known key found for this signature in database
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/issues.yml vendored Normal file
View File

@ -0,0 +1,12 @@
name: issues
on:
issues:
types: [labeled]
permissions:
issues: write
jobs:
help-wanted:
uses: laravel/.github/.github/workflows/issues.yml@main

4
CHANGELOG.md
View File

@ -1,7 +1,7 @@
# Release Notes # Release Notes
## [Unreleased](https://github.com/laravel/laravel/compare/v9.3.8...master) ## [Unreleased](https://github.com/laravel/laravel/compare/v9.3.12...master)
## [v10.0.0 (2022-02-07)](https://github.com/laravel/laravel/compare/v9.3.8...master) ## [v10.0.0 (2022-02-07)](https://github.com/laravel/laravel/compare/v9.3.12...master)
Laravel 10 includes a variety of changes to the application skeleton. Please consult the diff to see what's new. Laravel 10 includes a variety of changes to the application skeleton. Please consult the diff to see what's new.

2
lang/en/validation.php
View File

@ -71,6 +71,7 @@ return [
'ipv4' => 'The :attribute must be a valid IPv4 address.', 'ipv4' => 'The :attribute must be a valid IPv4 address.',
'ipv6' => 'The :attribute must be a valid IPv6 address.', 'ipv6' => 'The :attribute must be a valid IPv6 address.',
'json' => 'The :attribute must be a valid JSON string.', 'json' => 'The :attribute must be a valid JSON string.',
'lowercase' => 'The :attribute must be lowercase.',
'lt' => [ 'lt' => [
'array' => 'The :attribute must have less than :value items.', 'array' => 'The :attribute must have less than :value items.',
'file' => 'The :attribute must be less than :value kilobytes.', 'file' => 'The :attribute must be less than :value kilobytes.',
@ -138,6 +139,7 @@ return [
'timezone' => 'The :attribute must be a valid timezone.', 'timezone' => 'The :attribute must be a valid timezone.',
'unique' => 'The :attribute has already been taken.', 'unique' => 'The :attribute has already been taken.',
'uploaded' => 'The :attribute failed to upload.', 'uploaded' => 'The :attribute failed to upload.',
'uppercase' => 'The :attribute must be uppercase.',
'url' => 'The :attribute must be a valid URL.', 'url' => 'The :attribute must be a valid URL.',
'uuid' => 'The :attribute must be a valid UUID.', 'uuid' => 'The :attribute must be a valid UUID.',

2
package.json
View File

@ -6,7 +6,7 @@
}, },
"devDependencies": { "devDependencies": {
"axios": "^1.1.2", "axios": "^1.1.2",
"laravel-vite-plugin": "^0.6.0", "laravel-vite-plugin": "^0.7.0",
"lodash": "^4.17.19", "lodash": "^4.17.19",
"postcss": "^8.1.14", "postcss": "^8.1.14",
"vite": "^3.0.0" "vite": "^3.0.0"

2
resources/js/bootstrap.js vendored
View File

@ -26,7 +26,7 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
// window.Echo = new Echo({ // window.Echo = new Echo({
// broadcaster: 'pusher', // broadcaster: 'pusher',
// key: import.meta.env.VITE_PUSHER_APP_KEY, // key: import.meta.env.VITE_PUSHER_APP_KEY,
// wsHost: import.meta.env.VITE_PUSHER_HOST ?? `ws-${import.meta.env.VITE_PUSHER_APP_CLUSTER}.pusher.com`, // wsHost: import.meta.env.VITE_PUSHER_HOST ? import.meta.env.VITE_PUSHER_HOST : `ws-${import.meta.env.VITE_PUSHER_APP_CLUSTER}.pusher.com`,
// wsPort: import.meta.env.VITE_PUSHER_PORT ?? 80, // wsPort: import.meta.env.VITE_PUSHER_PORT ?? 80,
// wssPort: import.meta.env.VITE_PUSHER_PORT ?? 443, // wssPort: import.meta.env.VITE_PUSHER_PORT ?? 443,
// forceTLS: (import.meta.env.VITE_PUSHER_SCHEME ?? 'https') === 'https', // forceTLS: (import.meta.env.VITE_PUSHER_SCHEME ?? 'https') === 'https',