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

867 Commits

Author SHA1 Message Date
snipe 2b2e6a8829 Additional localization strings 2015-07-25 00:20:17 -07:00
snipe 6dea227c3e Fixes #851 - bulk user delete 2015-07-24 22:37:15 -07:00
snipe cf3619d766 Fixes #937 - bug in which type of asset 2015-07-24 18:09:11 -07:00
snipe 991a364a3d Updated form to use username 2015-07-24 16:56:31 -07:00
snipe eaf077f807 Fixes #946 - navbar custom color not working in FF 2015-07-24 16:29:54 -07:00
snipe e4bee3d372 Merge pull request #951 from madd15/fixes-1 
Fix asset view duplicate file uploads and layout
 2015-07-24 15:12:04 -07:00
madd15 2835905398 Fix dup file uploads and layout 2015-07-24 12:24:10 +09:30
madd15 b918ea88cc Add checkin email template 2015-07-24 10:29:44 +09:30
madd15 42e101291e Add Email on Checkin Field 2015-07-24 10:25:11 +09:30
madd15 fd9e8b712b Add flexibility if values not present 2015-07-24 09:26:34 +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 4f1f21287c Add Expected Checkin Date 2015-07-23 12:37:45 +09:30
madd15 dea23bef45 Add Expected Checkin Date 2015-07-23 11:53:07 +09:30
madd15 7afcd09651 Add Expected Checkin Date 2015-07-23 10:07:04 +09:30
Vincent Sposato e47146faee Moved link for asset maintenances to the asset menu with the other items related to assets / hardware 2015-07-20 21:35:37 -04:00
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 3df0550b19 Built the report and the export for the Improvements report 
Added the links on the navigation
 2015-07-20 21:26:23 -04:00
Vincent Sposato 5a2ca33d0f Minor changes to the index attempting to get footer callback to work 2015-07-20 21:16:54 -04:00
Vincent Sposato 4c37dcf5bb Finished off the edit and view pages 2015-07-20 21:16:15 -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 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 c253000af1 Updated the ImprovementsController to support date formatting for start and completion date on the data table 
Updated the supplier and hardware view views to include the date formatting for start and completion date
 2015-07-20 21:15:33 -04:00
Vincent Sposato 05219e69c4 Created and updated the add / edit form for the Improvement 2015-07-20 21:15:08 -04:00
Vincent Sposato c3439b41b8 Updated the view for a hardware asset so that we could see the improvements on an asset 2015-07-20 21:14:51 -04:00
Vincent Sposato 8ddf035a9b Updated the left sidebar of the layout to include the new Improvements area 2015-07-20 21:03:36 -04:00
Vincent Sposato cf46e322b9 Created the index page using datatables 2015-07-20 21:02:50 -04:00
Vincent Sposato 3e2bd02ce5 Fixed issue with migration that left off the deleted_at field 2015-07-20 21:02:04 -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 9d949a5b89 Merge branch '2.0' of github.com:snipe/snipe-it into 2.0 2015-07-20 16:34:55 -07:00
snipe 01c2968388 Revert "Fixes #863 - clickable order number in asset view" 
This reverts commit 0c842fc772.
 2015-07-20 16:34:14 -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
madd15 2f0f2c5002 Add additional Fields 2015-07-20 14:33:50 +09:30
snipe 0c842fc772 Fixes #863 - clickable order number in asset view 2015-07-16 21:21:09 -07:00
snipe 919df7ed56 Part of #863 - adds order number to asset listing 2015-07-16 19:54:56 -07:00
snipe de62db5e18 Fixes #901 - added notes field to list view 2015-07-16 19:45:10 -07:00
madd15 ba94a57e08 Adjust Manager and Location width 2015-07-16 10:26:53 +09:30
snipe f09ee24975 Merge pull request #908 from madd15/license-delete-modal 
Add title and content to delete modal for License File Uploads
 2015-07-13 09:22:51 -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 0154f240f3 Fixes JavaScript for edited assets 2015-07-10 22:48:21 -07:00
Vincent Sposato a7abea692d Moved link for asset maintenances to the asset menu with the other items related to assets / hardware 2015-07-10 10:25:32 -04:00
madd15 2841eadc91 Add title and content to delete modal 2015-07-10 09:57:03 +09:30
madd15 616af831a7 Add title and content to delete modal 2015-07-10 09:54:14 +09:30
madd15 1e730078c1 Add file uploads to Users 2015-07-10 09:23:34 +09:30
snipe 0132360e49 Added spinner to show activity during ajax 
TO DO:

- Account for the default state when the page is loaded on edit (currently using onchange)

- If no status or model is selected, return false or something else so that it doesn't try to make the ajax call with no ID
 2015-07-09 08:45:06 -07:00
snipe 15e1774a13 Centered checkboxes for select all 2015-07-09 03:57:20 -07:00
snipe 16b49c25e1 Bringing back the spinner on processing screen 2015-07-09 03:56:18 -07:00
snipe c61adc7041 Partial fix for #851 datatables. Because clear error reporting is apparently for suckers 2015-07-09 03:20:57 -07:00
snipe 6524ac3678 Beginning of #851 - no controller methods yet, but still troubleshooting stupid datatables errors. 
[Error] TypeError: undefined is not an object (evaluating 'f.nTf=a[b].cell')
	jb (jquery.dataTables.min.js, line 24)
	ga (jquery.dataTables.min.js, line 45)
	(anonymous function) (jquery.dataTables.min.js, line 92)
	each (jquery-latest.js, line 383)
	each (jquery-latest.js, line 136)
	o (jquery.dataTables.min.js, line 82)
	(anonymous function) (users, line 371)
	fire (jquery-latest.js, line 3119)
	fireWith (jquery-latest.js, line 3231)
	ready (jquery-latest.js, line 3443)
	completed (jquery-latest.js, line 3474)
 2015-07-09 03:09:18 -07:00
snipe 7e5f32c9d8 Merge pull request #898 from madd15/Default-Layout-fix 
Small UI fixes
 2015-07-09 01:17:02 -07:00
snipe 4a5066054b Display bugfixes for #819 2015-07-08 22:38:35 -07:00