ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2015-04-01 17:41:21 -07:00
parent dc1380edd1 e4b45231ec
commit 7ad6dda260
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/commands/AppCommand.php
+1
View File
@@ -318,6 +318,7 @@ class AppCommand extends Command
$data = array_merge($this->userData, array(
'activated' => 1,
'manager_id' => NULL,
'notes' => 'Generated on install',
'permissions' => array(
'admin' => 1,
'user' => 1,
app/config/version.php
+2 -2
View File
@@ -1,5 +1,5 @@
<?php
return array (
'app_version' => 'v1.2.6.1-166',
'hash_version' => 'v1.2.6.1-166-g51148f1',
'app_version' => 'v1.2.6.1-179',
'hash_version' => 'v1.2.6.1-179-gb53847c',
);
app/database/seeds/ActionlogSeeder.php
+3 -3
View File
@@ -15,7 +15,7 @@ class ActionlogSeeder extends Seeder
'user_id' => '1',
'action_type' => 'checkout',
'asset_id' => '1',
'checkedout_to' => '2',
'checkedout_to' => '1',
'location_id' => '3',
'created_at' => $date->modify('-10 day'),
'asset_type' => 'hardware',
@@ -28,7 +28,7 @@ class ActionlogSeeder extends Seeder
'user_id' => '1',
'action_type' => 'checkin from',
'asset_id' => '1',
'checkedout_to' => '2',
'checkedout_to' => '1',
'location_id' => NULL,
'created_at' => $date->modify('-10 day'),
'asset_type' => 'hardware',
@@ -54,7 +54,7 @@ class ActionlogSeeder extends Seeder
'user_id' => '1',
'action_type' => 'checkin from',
'asset_id' => '1',
'checkedout_to' => '2',
'checkedout_to' => '1',
'location_id' => NULL,
'created_at' => $date->modify('-10 day'),
'asset_type' => 'software',
app/database/seeds/LicenseSeatsSeeder.php
+3 -3
View File
@@ -24,7 +24,7 @@ class LicenseSeatsSeeder extends Seeder
$license_seats[] = array(
'license_id' => '1',
'assigned_to' => '2',
'assigned_to' => '1',
'created_at' => $date->modify('-10 day')->format('Y-m-d H:i:s'),
'updated_at' => $date->modify('-3 day')->format('Y-m-d H:i:s'),
'deleted_at' => NULL,
@@ -35,7 +35,7 @@ class LicenseSeatsSeeder extends Seeder
$license_seats[] = array(
'license_id' => '1',
'assigned_to' => '2',
'assigned_to' => '1',
'created_at' => $date->modify('-10 day')->format('Y-m-d H:i:s'),
'updated_at' => $date->modify('-3 day')->format('Y-m-d H:i:s'),
'deleted_at' => NULL,
@@ -57,7 +57,7 @@ class LicenseSeatsSeeder extends Seeder
$license_seats[] = array(
'license_id' => '1',
'assigned_to' => '2',
'assigned_to' => '1',
'created_at' => $date->modify('-10 day')->format('Y-m-d H:i:s'),
'updated_at' => $date->modify('-3 day')->format('Y-m-d H:i:s'),
'deleted_at' => NULL,