DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2020-11-09 22:43:41 -08:00
parent b59269d5e2 33dca84ec7
commit 31bbb2d035
5 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Providers/AuthServiceProvider.php
View file

@ -89,6 +89,7 @@ class AuthServiceProvider extends ServiceProvider
Passport::routes();
Passport::tokensExpireIn(Carbon::now()->addYears(20));
Passport::refreshTokensExpireIn(Carbon::now()->addYears(20));
Passport::personalAccessTokensExpireIn(Carbon::now()->addYears(20));
Passport::withCookieSerialization();

BIN
public/js/build/app.js
View file

Binary file not shown.

BIN
public/js/dist/all.js vendored
View file

Binary file not shown.

4
public/mix-manifest.json
View file

@ -1,5 +1,5 @@
{
"/js/build/app.js": "/js/build/app.js?id=fc54bb0c7977c14f519b",
"/js/build/app.js": "/js/build/app.js?id=2f6c6e40a6009d5d0066",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=59413334823616b81341",
"/css/build/app.css": "/css/build/app.css?id=032fd8c3fce99c7fd862",
"/css/build/overrides.css": "/css/build/overrides.css?id=0b4aefd7ef0c117ef23a",
@ -34,5 +34,5 @@
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=1e77fde04b3f42432581",
"/js/build/vendor.js": "/js/build/vendor.js?id=aff75d5aad5e7b429723",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=58d95c93430f2ae33392",
"/js/dist/all.js": "/js/dist/all.js?id=0a2c2c95ab18fa16faa1"
"/js/dist/all.js": "/js/dist/all.js?id=f9ad3790a16ec5348bff"
}

14
resources/assets/js/components/passport/PersonalAccessTokens.vue
View file

@ -31,8 +31,10 @@
<table class="table table-borderless m-b-none" v-if="tokens.length > 0">
<thead>
<tr>
<th class="col-md-9">Name</th>
<th class="col-md-3"><span class="sr-only">Delete</span></th>
<th class="col-md-3">Name</th>
<th class="col-md-2">Created</th>
<th class="col-md-2">Expires</th>
<th class="col-md-2"><span class="sr-only">Delete</span></th>
</tr>
</thead>
@ -43,6 +45,14 @@
{{ token.name }}
</td>
<td style="vertical-align: middle;">
{{ token.expires_at }}
</td>
<td style="vertical-align: middle;">
{{ token.created_at }}
</td>
<!-- Delete Button -->
<td style="vertical-align: middle;" class="text-right">
<a class="action-link btn btn-danger btn-sm" @click="revoke(token)">