Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '8.x' 

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Dries Vints 2021-03-16 17:26:56 +01:00
parent 38207d610d 57ddc0ebbb
commit f51adc5b53
No known key found for this signature in database
GPG Key ID: E1529B3ACC4A5A76
6 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGELOG.md
View File

@ -1,6 +1,17 @@
# Release Notes # Release Notes
## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.13...master) ## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.14...master)
## [v8.5.14 (2021-03-16)](https://github.com/laravel/laravel/compare/v8.5.13...v8.5.14)
### Changed
- Add language for prohibited_if and prohibited_unless validation rules ([#5557](https://github.com/laravel/laravel/pull/5557))
- Add date facade alias ([#5556](https://github.com/laravel/laravel/pull/5556))
### Fixed
- Add log level config value to stderr channel ([#5558](https://github.com/laravel/laravel/pull/5558))
- Fix footer on mobile ([#5561](https://github.com/laravel/laravel/pull/5561))
## [v8.5.13 (2021-03-09)](https://github.com/laravel/laravel/compare/v8.5.12...v8.5.13) ## [v8.5.13 (2021-03-09)](https://github.com/laravel/laravel/compare/v8.5.12...v8.5.13)

1
config/app.php
View File

@ -201,6 +201,7 @@
'Config' => Illuminate\Support\Facades\Config::class, 'Config' => Illuminate\Support\Facades\Config::class,
'Cookie' => Illuminate\Support\Facades\Cookie::class, 'Cookie' => Illuminate\Support\Facades\Cookie::class,
'Crypt' => Illuminate\Support\Facades\Crypt::class, 'Crypt' => Illuminate\Support\Facades\Crypt::class,
'Date' => Illuminate\Support\Facades\Date::class,
'DB' => Illuminate\Support\Facades\DB::class, 'DB' => Illuminate\Support\Facades\DB::class,
'Eloquent' => Illuminate\Database\Eloquent\Model::class, 'Eloquent' => Illuminate\Database\Eloquent\Model::class,
'Event' => Illuminate\Support\Facades\Event::class, 'Event' => Illuminate\Support\Facades\Event::class,

1
config/logging.php
View File

@ -74,6 +74,7 @@
'stderr' => [ 'stderr' => [
'driver' => 'monolog', 'driver' => 'monolog',
'level' => env('LOG_LEVEL', 'debug'),
'handler' => StreamHandler::class, 'handler' => StreamHandler::class,
'formatter' => env('LOG_STDERR_FORMATTER'), 'formatter' => env('LOG_STDERR_FORMATTER'),
'with' => [ 'with' => [

6
public/index.php
View File

@ -7,11 +7,11 @@
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Check If Application Is Under Maintenance | Check If The Application Is Under Maintenance
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| If the application is maintenance / demo mode via the "down" command we | If the application is in maintenance / demo mode via the "down" command
| will require this file so that any prerendered template can be shown | we will load this file so that any pre-rendered content can be shown
| instead of starting the framework, which could cause an exception. | instead of starting the framework, which could cause an exception.
| |
*/ */

2
resources/lang/en/validation.php
View File

@ -104,6 +104,8 @@
'required_with_all' => 'The :attribute field is required when :values are present.', 'required_with_all' => 'The :attribute field is required when :values are present.',
'required_without' => 'The :attribute field is required when :values is not present.', 'required_without' => 'The :attribute field is required when :values is not present.',
'required_without_all' => 'The :attribute field is required when none of :values are present.', 'required_without_all' => 'The :attribute field is required when none of :values are present.',
'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
'same' => 'The :attribute and :other must match.', 'same' => 'The :attribute and :other must match.',
'size' => [ 'size' => [
'numeric' => 'The :attribute must be :size.', 'numeric' => 'The :attribute must be :size.',

2
resources/views/welcome.blade.php
View File

@ -21,7 +21,7 @@
</style> </style>
</head> </head>
<body class="antialiased"> <body class="antialiased">
<div class="relative flex items-top justify-center min-h-screen bg-gray-100 dark:bg-gray-900 sm:items-center sm:pt-0"> <div class="relative flex items-top justify-center min-h-screen bg-gray-100 dark:bg-gray-900 sm:items-center py-4 sm:pt-0">
@if (Route::has('login')) @if (Route::has('login'))
<div class="hidden fixed top-0 right-0 px-6 py-4 sm:block"> <div class="hidden fixed top-0 right-0 px-6 py-4 sm:block">
@auth @auth