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

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-11-09 13:28:12 -08:00
parent 2f34336f2b 012afe99e2
commit f56e1768b6
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Models/License.php
View file

@ -22,7 +22,14 @@ class License extends Depreciable
protected $injectUniqueIdentifier = true; protected $injectUniqueIdentifier = true;
use ValidatingTrait; use ValidatingTrait;
protected $dates = ['deleted_at']; // We set these as protected dates so that they will be easily accessible via Carbon
protected $dates = [
'created_at',
'updated_at',
'deleted_at',
'purchase_date'
];
public $timestamps = true; public $timestamps = true;

2
upgrade.php
View file

@ -106,7 +106,7 @@ echo "--------------------------------------------------------\n\n";
if (file_exists('composer.phar')) { if (file_exists('composer.phar')) {
echo "-- Local composer.phar detected, so we'll use that.\n\n"; echo "-- Local composer.phar detected, so we'll use that.\n\n";
$composer_dump = shell_exec('php composer.phar dump'); $composer_dump = shell_exec('php composer.phar dump');
$composer = shell_exec('php composer.phar install --prefer-source'); $composer = shell_exec('php composer.phar install --no-dev --prefer-source');
} else { } else {
echo "-- We couldn't find a local composer.phar - trying globally.\n\n"; echo "-- We couldn't find a local composer.phar - trying globally.\n\n";