ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,579 Commits 84 Branches 293 Tags
4abe93ae2ec602aea290d9ea0ca215a4e49de44d
Commit Graph

197 Commits

Author SHA1 Message Date
snipe 3719f9a5a8 Added supplier ID to asset seeder 2015-09-15 03:45:00 -07:00
snipe f9dc5766a7 Suppliers seeder 2015-09-15 03:41:37 -07:00
snipe c6b6ccc814 More seeders 2015-09-15 03:31:20 -07:00
snipe a2f6d8f72e Change to #1174 - pull other functions out of if statement 2015-09-14 21:52:51 -07:00
snipe 39f82e546f Fixes #1174 - broken migration if asset_logs table has uploads 2015-09-14 21:40:05 -07:00
snipe 650f86406d Added custom CSS field in settings 2015-09-09 13:17:36 -07:00
Brady Wetherington 7ae226635f First rough pass at asset acceptance report 2015-08-07 18:50:55 -04:00
Vincent Sposato afbe23c214 Attempting to make the unaccepted assets report use more Eloquent features rather than a raw query 
Updated the migration to include the migration of existing data - still have issue with a fresh load, as seeded data isn't there until after the migrations occur
Removed the artisan command
 2015-08-07 18:50:55 -04:00
snipe eb00acddfd Trying to fix the broken migration 2015-08-04 14:55:10 -07:00
snipe b20fecc2de Make thread_id default null 2015-08-03 12:35:54 -07:00
Vincent Sposato c74c89a171 Fixed the migration for adding thread_id to correct the table name and make thread_id nullable 2015-07-30 21:02:57 -04:00
Vincent Sposato 87c493bf12 Added the migration for the thread_id on the asset_logs table 
Added the relationships for the self-referential links on thread_id
 2015-07-29 19:10:59 -04:00
snipe ac5dd0dbf9 Remove unique constraint on email 2015-07-24 23:05:11 -07:00
madd15 f154692dad Add Checkin_email to Catergories Table 2015-07-24 10:20:50 +09:30
snipe 0de1d45492 Merge pull request #944 from madd15/Feature/Additional-Email-Info 
WIP - Feature #709/#606 - Additional Email Info / Expected Checkin Date
 2015-07-23 16:16:19 -07:00
madd15 878a163d11 Create Expected Checkin Date Column 2015-07-23 11:55:35 +09:30
Vincent Sposato d1d6fe26a6 Fixed all issues that were reported by @leobg 
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
 2015-07-20 21:34:19 -04:00
Vincent Sposato 5ee4eb5871 Update the migration to fix an issue with the improvement_time so it would be an integer 
Created the view for improvements
Updated messages in language pack for additional items needed
Updated the asset view and supplier view to fix an issue
 2015-07-20 21:15:46 -04:00
Vincent Sposato 0f5b8b5a90 Needed to fix nullable issues 2015-07-20 21:03:22 -04:00
Vincent Sposato 69a5c99396 Fixed the datetime fields to be date fields only 2015-07-20 21:03:12 -04:00
Vincent Sposato 3a3c021a6a One last fix to the migration to add the supplier relationship 2015-07-20 21:02:41 -04:00
Vincent Sposato 3e2bd02ce5 Fixed issue with migration that left off the deleted_at field 2015-07-20 21:02:04 -04:00
Vincent Sposato 2f83f2aa52 Updated migration to reflect relation to the asset 2015-07-20 21:01:48 -04:00
Vincent Sposato 914b1cb628 Added the improvements table migration to create the improvements table 2015-07-20 21:01:33 -04:00
Brady Wetherington c683c1c57e Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking" 
This reverts commit 41b711740a, reversing
changes made to 55309bfaef.

It also un-reverts reversions that were done inadvertently.
 2015-07-20 17:12:28 -07:00
snipe 41b711740a Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking 
# Conflicts:
#	app/controllers/admin/ReportsController.php
#	app/lang/en/general.php
#	app/routes.php
#	app/views/backend/hardware/view.blade.php
#	app/views/backend/layouts/default.blade.php
#	composer.lock
 2015-07-20 16:12:35 -07:00
snipe 84ffc1a728 Migration for location-specific currency, updated views for #819 
This isn't done yet though. All kinds of busted stuff.
 2015-07-08 20:35:40 -07:00
Vincent Sposato 1b423f5b54 Fixed all issues that were reported by @leobg 
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
 2015-07-06 10:36:54 -04:00
Vincent Sposato b7f050aa3b Update the migration to fix an issue with the improvement_time so it would be an integer 
Created the view for improvements
Updated messages in language pack for additional items needed
Updated the asset view and supplier view to fix an issue
 2015-06-27 17:15:23 -04:00
Vincent Sposato 9316b2bed0 Needed to fix nullable issues 2015-06-27 13:42:42 -04:00
Vincent Sposato 58ce44c935 Fixed the datetime fields to be date fields only 2015-06-27 13:16:25 -04:00
Vincent Sposato 0f190e094d One last fix to the migration to add the supplier relationship 2015-06-27 12:41:40 -04:00
Vincent Sposato a5292d4b71 Fixed issue with migration that left off the deleted_at field 2015-06-27 12:26:40 -04:00
Vincent Sposato cd7a7fa3d2 Updated migration to reflect relation to the asset 2015-06-27 11:02:41 -04:00
Vincent Sposato 255a492db6 Added the improvements table migration to create the improvements table 2015-06-27 10:51:22 -04:00
snipe 75b9b70a86 Fix email field so it's nullable, fix app command to add user 2015-06-23 00:11:54 -07:00
snipe 2e585f9cd2 Fixes #839 - bad seed data 2015-06-23 00:11:06 -07:00
snipe bf6674f6a0 Added table prefix for raw queries 2015-06-19 18:03:28 -07:00
snipe fdef266089 Addresses #577 and fixes #165 - switch from email to username 2015-06-15 12:16:39 -07:00
snipe 19604480bb Consumables section 
TODO:

- Add checkout to location
- Drop Checkin (doesn't really exist in this context)
- Add missing strings - consolidate where possible. Lots of dupes :-/
 2015-06-09 19:50:34 -07:00
snipe 704d66b6f3 Raw DB migration for nullable user notes 2015-06-09 17:45:11 -07:00
snipe 6315c343a7 Add consumables table 2015-06-09 17:44:59 -07:00
snipe 766b4b901f Fixes #822 - make user notes field nullable default null 2015-06-09 17:34:52 -07:00
snipe 123caf42c2 Merge remote-tracking branch 'origin/develop' into 1.3.0 
# Conflicts:
#	app/views/backend/hardware/labels.blade.php
#	app/views/backend/layouts/default.blade.php
 2015-05-27 11:17:14 -07:00
Tom Castleman b161a38e9b Add licenses.reassignable migration 
Implement licenses.reassignable

View edit for licenses.reassignable

Add licenses.reassignable to LicensesController

Disable Check In when !license->reassignable

Validate license check-in post
 2015-05-22 14:11:36 +01:00
snipe f463cd6c8d Fixes for #759 - location heirarchy 2015-05-04 02:50:42 -07:00
snipe 3c00f38a0f Slack integration for asset checkin/checkout 2015-04-29 17:38:22 -07:00
snipe e4b45231ec Fix for bad seed data if Jon Doe doesn't get created 2015-04-01 17:22:48 -07:00
madd15 53ab21b016 Migration to add notes field to users 2015-03-18 16:47:52 +10:30
snipe 4243710378 Added location to new assets view 2015-03-14 01:30:12 -07:00