mirror of
https://github.com/laravel/laravel.git
synced 2025-02-20 11:53:14 +08:00
Merge branch '9.x'
# Conflicts: # CHANGELOG.md
This commit is contained in:
commit
9fb954fb90
12
.github/workflows/issues.yml
vendored
Normal file
12
.github/workflows/issues.yml
vendored
Normal 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
|
@ -1,7 +1,7 @@
|
||||
# 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.
|
||||
|
@ -71,6 +71,7 @@ return [
|
||||
'ipv4' => 'The :attribute must be a valid IPv4 address.',
|
||||
'ipv6' => 'The :attribute must be a valid IPv6 address.',
|
||||
'json' => 'The :attribute must be a valid JSON string.',
|
||||
'lowercase' => 'The :attribute must be lowercase.',
|
||||
'lt' => [
|
||||
'array' => 'The :attribute must have less than :value items.',
|
||||
'file' => 'The :attribute must be less than :value kilobytes.',
|
||||
@ -138,6 +139,7 @@ return [
|
||||
'timezone' => 'The :attribute must be a valid timezone.',
|
||||
'unique' => 'The :attribute has already been taken.',
|
||||
'uploaded' => 'The :attribute failed to upload.',
|
||||
'uppercase' => 'The :attribute must be uppercase.',
|
||||
'url' => 'The :attribute must be a valid URL.',
|
||||
'uuid' => 'The :attribute must be a valid UUID.',
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"axios": "^1.1.2",
|
||||
"laravel-vite-plugin": "^0.6.0",
|
||||
"laravel-vite-plugin": "^0.7.0",
|
||||
"lodash": "^4.17.19",
|
||||
"postcss": "^8.1.14",
|
||||
"vite": "^3.0.0"
|
||||
|
2
resources/js/bootstrap.js
vendored
2
resources/js/bootstrap.js
vendored
@ -26,7 +26,7 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
|
||||
// window.Echo = new Echo({
|
||||
// broadcaster: 'pusher',
|
||||
// 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,
|
||||
// wssPort: import.meta.env.VITE_PUSHER_PORT ?? 443,
|
||||
// forceTLS: (import.meta.env.VITE_PUSHER_SCHEME ?? 'https') === 'https',
|
||||
|
Loading…
x
Reference in New Issue
Block a user