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

283 Commits

Author SHA1 Message Date
Vincent Sposato 8f68bdb318 Working through getting the dataset correctly from the asset logs so that we can generate a report 2015-08-01 12:17:13 -04:00
Vincent Sposato 239f438a98 Added a scope to the Category model to pull back only categories that required acceptance 2015-08-01 12:14:21 -04:00
Vincent Sposato 41127bf5dd Added scope to the Asset model to pull all assets that belonged to a list of models 2015-08-01 12:14:21 -04:00
Vincent Sposato 64bff852bd Added a scope to the Model model to allow for selecting only models that belong to a list of categories 2015-08-01 12:14:20 -04:00
Vincent Sposato 7876ae462c 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:16:57 -04:00
snipe 480fd78c51 Disllow delete if parent 2015-07-28 20:45:32 -07:00
snipe 0c9018289b Fixes #970 2015-07-28 20:24:58 -07:00
snipe 26e081a2cb Fixes #909 again, because math is super hard 2015-07-27 15:26:53 -07:00
madd15 f9c7022bcc Add checkin_email() 2015-07-24 12:01:21 +09:30
madd15 60d05e1ae1 Add checkin_email() 2015-07-24 11:58:09 +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 2457003deb Fixed issue found with date being handled incorrectly 
Updated multiple views to reflect this issue
 2015-07-20 21:16:06 -04:00
Vincent Sposato e479575825 Added all of the functionality for the Improvement to be linked to the Asset 2015-07-20 21:11:17 -04:00
Vincent Sposato 3aa3d67675 Fixed the need to only be a date instead of a date time 2015-07-20 21:03:00 -04:00
Vincent Sposato 4b3267649a Updated the Improvement and Supplier relationship 2015-07-20 21:02:31 -04:00
Vincent Sposato 1c4190bf22 Added the relation to the improvement to the model, so that we can reference these items 2015-07-20 21:02:21 -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 56345b5743 Fixes #909 - expired licenses showing in email report 2015-07-13 20:59:02 -07:00
snipe aed7036595 Merge pull request #907 from madd15/user-fileuploads 
Feature #746 - Add File Uploads to Users
 2015-07-13 09:22:39 -07:00
snipe 9fbb9746bc Merge pull request #895 from madd15/patch-1 
Add Checkout of first available license to license list view
 2015-07-13 09:22:18 -07:00
madd15 f04b3f9b09 Change to LicenseSeat 2015-07-10 10:02:46 +09:30
madd15 1e730078c1 Add file uploads to Users 2015-07-10 09:23:34 +09:30
snipe e1724cf25f Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	.gitignore
#	app/config/production/session.example.php
#	app/config/staging/session.example.php
#	app/config/version.php
#	app/models/User.php
 2015-07-09 01:02:49 -07:00
snipe e9443a244c Small fix to config value 2015-07-09 00:52:05 -07:00
snipe f8be47dfbf Fixes #903 - adds config variable for multi_login, overrides Sentry method 2015-07-09 00:41:46 -07:00
snipe 4a5066054b Display bugfixes for #819 2015-07-08 22:38: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
snipe 74429d9075 Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/lang/en/general.php
#	app/start/artisan.php
#	app/views/backend/hardware/edit.blade.php
#	app/views/backend/layouts/default.blade.php
 2015-07-08 18:07:53 -07:00
snipe de23ec5785 Fixes #544 - disable checking an asset out to a user if it is not a deployable status 2015-07-08 17:18:46 -07:00
madd15 38c36699a7 Add freeSeat function 2015-07-07 12:32:33 +09:30
snipe 1edce0a4fa Merge branch '2.0' of github.com:snipe/snipe-it into 2.0 2015-07-06 19:29:22 -07:00
snipe 7da7907fbd Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/controllers/admin/AssetsController.php
 2015-07-06 19:29:06 -07:00
madd15 1301119c9a Remove unique from modelno validation rule 2015-07-07 09:50:43 +09:30
snipe f855bfd4ef Better error checking for eol data 2015-07-06 14:09:48 -07:00
snipe 674348b5a5 Smaller text requirement for address2 2015-07-06 14:06:31 -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
snipe 7d5810b656 Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/config/version.php
#	app/controllers/admin/AssetsController.php
 2015-07-02 17:23:06 -07:00
snipe 552bdfdc2d Switched defaultLoc to belongsTo relationship 2015-07-02 16:51:52 -07:00
snipe bb7ce83c48 Merge remote-tracking branch 'origin/develop' into 2.0 2015-06-30 22:42:00 -07:00
snipe 95920be8ea Fixed weird commenting 2015-06-30 22:04:05 -07:00
Vincent Sposato b2847811ef Fixed issue found with date being handled incorrectly 
Updated multiple views to reflect this issue
 2015-06-27 17:42:15 -04:00
Vincent Sposato c90ea92a4e Added all of the functionality for the Improvement to be linked to the Asset 2015-06-27 14:37:40 -04:00
Vincent Sposato c59c5e35f8 Fixed the need to only be a date instead of a date time 2015-06-27 13:15:08 -04:00
Vincent Sposato 0c63dac5e7 Updated the Improvement and Supplier relationship 2015-06-27 12:41:16 -04:00
Vincent Sposato 3a86c53b49 Added the relation to the improvement to the model, so that we can reference these items 2015-06-27 12:27:15 -04:00
Vincent Sposato 255a492db6 Added the improvements table migration to create the improvements table 2015-06-27 10:51:22 -04:00
snipe fc1e8a4e4e Minor comment tweak 2015-06-23 15:05:21 -07:00
snipe 28a9f90a72 Lazy eager load history for optimized queries 2015-06-23 13:44:49 -07:00