Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: laravel/jetstream
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.1.0
Choose a base ref
...
head repository: laravel/jetstream
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.1.1
Choose a head ref
  • 3 commits
  • 4 files changed
  • 3 contributors

Commits on Nov 7, 2023

  1. Update CHANGELOG

    @driesvints @github-actions
    driesvints authored and github-actions[bot] committed Nov 7, 2023

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    91cd4e4 View commit details

Commits on Nov 21, 2023

  1. deleteTeam() return type (#1406) 

    * deleteTeam() return type

Fix invalid return type.
The deleteTeam() method currently has `void` set as return type.
It redirects...

This changes the return type to `\Illuminate\Http\Response | \Illuminate\Http\RedirectResponse | \Livewire\Features\SupportRedirects\Redirector `

* Update DeleteTeamForm.php

---------

Co-authored-by: Taylor Otwell <taylor@laravel.com>
    @tanthammar @taylorotwell
    tanthammar and taylorotwell authored Nov 21, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7f790e4 View commit details

Commits on Nov 27, 2023

  1. set password in session on update for inertia (#1411)

    @taylorotwell
    taylorotwell authored Nov 27, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bd7faef View commit details
Showing with 18 additions and 3 deletions.
  1. +7 −1 CHANGELOG.md
  2. +1 −1 composer.json
  3. +1 −1 src/Http/Livewire/DeleteTeamForm.php
  4. +9 −0 src/JetstreamServiceProvider.php
8 changes: 7 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Release Notes

## [Unreleased](https://github.com/laravel/jetstream/compare/v4.0.5...4.x)
## [Unreleased](https://github.com/laravel/jetstream/compare/v4.1.0...4.x)

## [v4.1.0](https://github.com/laravel/jetstream/compare/v4.0.5...v4.1.0) - 2023-11-07

- Typehint mutator profile_photo_url attribute function return by [@potsky](https://github.com/potsky) in https://github.com/laravel/jetstream/pull/1396
- [4.x] Use PHPUnit 10 by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/jetstream/pull/1400
- [4.x] Replace `jenssegers/agent` and use latest `mobiledetect/mobiledetectlib` by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/jetstream/pull/1399

## [v4.0.5](https://github.com/laravel/jetstream/compare/v4.0.4...v4.0.5) - 2023-10-27

2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
"ext-json": "*",
"illuminate/console": "^10.17",
"illuminate/support": "^10.17",
"laravel/fortify": "^1.15",
"laravel/fortify": "^1.19",
"mobiledetect/mobiledetectlib": "^4.8"
},
"require-dev": {
2 changes: 1 addition & 1 deletion src/Http/Livewire/DeleteTeamForm.php
View file
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ public function mount($team)
*
* @param \Laravel\Jetstream\Actions\ValidateTeamDeletion $validator
* @param \Laravel\Jetstream\Contracts\DeletesTeams $deleter
* @return void
* @return mixed
*/
public function deleteTeam(ValidateTeamDeletion $validator, DeletesTeams $deleter)
{
9 changes: 9 additions & 0 deletions src/JetstreamServiceProvider.php
View file
Original file line number Diff line number Diff line change
@@ -6,10 +6,13 @@
use Illuminate\Contracts\Http\Kernel;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\ServiceProvider;
use Illuminate\View\Compilers\BladeCompiler;
use Inertia\Inertia;
use Laravel\Fortify\Events\PasswordUpdatedViaController;
use Laravel\Fortify\Fortify;
use Laravel\Jetstream\Http\Livewire\ApiTokenManager;
use Laravel\Jetstream\Http\Livewire\CreateTeamForm;
@@ -178,6 +181,12 @@ protected function bootInertia()
$kernel->appendToMiddlewarePriority(HandleInertiaRequests::class);
}

Event::listen(function (PasswordUpdatedViaController $event) {
if (request()->hasSession()) {
request()->session()->put(['password_hash_sanctum' => Auth::user()->getAuthPassword()]);
}
});

Fortify::loginView(function () {
return Inertia::render('Auth/Login', [
'canResetPassword' => Route::has('password.request'),