Merge branch '2.x' of github.com:laravel/jetstream into 2.x

Author: taylorotwell

Diff for: CHANGELOG.md

@@ -1,6 +1,56 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/jetstream/compare/v1.6.6...master)
+## [Unreleased](https://github.com/laravel/jetstream/compare/v2.1.0...2.x)
+
+
+## [v2.1.0 (2021-01-12)](https://github.com/laravel/jetstream/compare/v2.0.3...v2.1.0)
+
+### Added
+- Add `--composer` option to the install command ([#607](https://github.com/laravel/jetstream/pull/607))
+
+### Changed
+- Automatically select API token when it's created ([#589](https://github.com/laravel/jetstream/pull/589))
+- Change current team of user when creating a new additional team ([#618](https://github.com/laravel/jetstream/pull/618))
+- Make text translatable in confirm-password livewire view ([#628](https://github.com/laravel/jetstream/pull/628))
+
+### Fixed
+- Banner should be hidden in default ([#599](https://github.com/laravel/jetstream/pull/599))
+- Jetstream ignoring sessions from session connection in config ([#630](https://github.com/laravel/jetstream/pull/630))
+
+
+## [v2.0.3 (2021-01-06)](https://github.com/laravel/jetstream/compare/v2.0.2...v2.0.3)
+
+### Added
+- Allow publishing of missing Inertia files ([#596](https://github.com/laravel/jetstream/pull/596), [b28ee67](https://github.com/laravel/jetstream/commit/b28ee670590312d014448c2c8f2479ec264c64cc))
+
+### Changed
+- Make button text in team invitation email translatable ([#598](https://github.com/laravel/jetstream/pull/598))
+
+### Removed
+- Remove unused Vue components ([#596](https://github.com/laravel/jetstream/pull/596))
+
+### Fixed
+- Make a similar footer section on welcome page ([#602](https://github.com/laravel/jetstream/pull/602))
+
+
+## [v2.0.2 (2021-01-06)](https://github.com/laravel/jetstream/compare/v2.0.1...v2.0.2)
+
+### Fixed
+- Fix test ([d24c41b](https://github.com/laravel/jetstream/commit/d24c41bca5fd69fa369915565a18ac2510b04928))
+
+
+## [v2.0.1 (2021-01-06)](https://github.com/laravel/jetstream/compare/v2.0.0...v2.0.1)
+
+### Changed
+- Make cancel link translatable ([#592](https://github.com/laravel/jetstream/pull/592))
+
+### Fixed
+- Inertia Stack Authentication Page logo link update with inertia-link ([#594](https://github.com/laravel/jetstream/pull/594))
+
+
+## [v2.0.0 (2021-01-05)](https://github.com/laravel/jetstream/compare/v1.6.6...v2.0.0)
+
+A major new Jetstream release. Check out [the announcement post](https://blog.laravel.com/jetstream-20-released).
 
 
 ## [v1.6.6 (2021-01-05)](https://github.com/laravel/jetstream/compare/v1.6.5...v1.6.6)

Diff for: src/Http/Controllers/Inertia/OtherBrowserSessionsController.php

@@ -43,7 +43,7 @@ protected function deleteOtherSessionRecords(Request $request)
             return;
         }
 
-        DB::table(config('session.table', 'sessions'))
+        DB::connection(config('session.connection'))->table(config('session.table', 'sessions'))
             ->where('user_id', $request->user()->getAuthIdentifier())
             ->where('id', '!=', $request->session()->getId())
             ->delete();

Diff for: src/Http/Controllers/Inertia/UserProfileController.php

@@ -37,7 +37,7 @@ public function sessions(Request $request)
         }
 
         return collect(
-            DB::table(config('session.table', 'sessions'))
+            DB::connection(config('session.connection'))->table(config('session.table', 'sessions'))
                     ->where('user_id', $request->user()->getAuthIdentifier())
                     ->orderBy('last_activity', 'desc')
                     ->get()

Diff for: src/Http/Livewire/LogoutOtherBrowserSessionsForm.php

@@ -77,7 +77,7 @@ protected function deleteOtherSessionRecords()
             return;
         }
 
-        DB::table(config('session.table', 'sessions'))
+        DB::connection(config('session.connection'))->table(config('session.table', 'sessions'))
             ->where('user_id', Auth::user()->getAuthIdentifier())
             ->where('id', '!=', request()->session()->getId())
             ->delete();
@@ -95,7 +95,7 @@ public function getSessionsProperty()
         }
 
         return collect(
-            DB::table(config('session.table', 'sessions'))
+            DB::connection(config('session.connection'))->table(config('session.table', 'sessions'))
                     ->where('user_id', Auth::user()->getAuthIdentifier())
                     ->orderBy('last_activity', 'desc')
                     ->get()

Diff for: stubs/inertia/resources/js/Jetstream/Modal.vue

@@ -1,7 +1,7 @@
 <template>
     <portal to="modal">
         <transition leave-active-class="duration-200">
-            <div v-show="show" class="fixed inset-0 overflow-y-auto px-4 py-6 sm:px-0">
+            <div v-show="show" class="fixed inset-0 overflow-y-auto px-4 py-6 sm:px-0 z-50">
                 <transition enter-active-class="ease-out duration-300"
                         enter-class="opacity-0"
                         enter-to-class="opacity-100"

Diff for: stubs/livewire/resources/views/auth/confirm-password.blade.php

@@ -5,7 +5,7 @@
         </x-slot>
 
         <div class="mb-4 text-sm text-gray-600">
-            This is a secure area of the application. Please confirm your password before continuing.
+            {{ __('This is a secure area of the application. Please confirm your password before continuing.') }}
         </div>
 
         <x-jet-validation-errors class="mb-4" />

Diff for: stubs/tests/RegistrationTest.php

@@ -4,6 +4,7 @@
 
 use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Laravel\Jetstream\Jetstream;
 use Tests\TestCase;
 
 class RegistrationTest extends TestCase
@@ -24,6 +25,7 @@ public function test_new_users_can_register()
             'email' => '[email protected]',
             'password' => 'password',
             'password_confirmation' => 'password',
+            'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature(),
         ]);
 
         $this->assertAuthenticated();