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

464 Commits

Author SHA1 Message Date
snipe fdee3ee93e Merge pull request #933 from madd15/patch-4 
#916 - Change Userlist identifier from email to username
 2015-07-23 16:16:02 -07:00
snipe ef045c61ca Merge pull request #931 from madd15/patch-3 
Fix #930 - Add reassignable to create
 2015-07-23 16:15:53 -07:00
madd15 6d1197a144 Fix edit model cat list showing deleted categories 2015-07-24 08:44:53 +09:30
Vincent Sposato 130a041be0 Added Carbon to the uses statement for reports controller 2015-07-20 21:42:07 -04:00
Vincent Sposato a7a2f5f974 Minor change to reports controller to include the View facade 2015-07-20 21:41:29 -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 6eb296303f Working through attempts to get footer callback working 2015-07-20 21:17:04 -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 f0d9ba89df Created and built out the index and create functionality - still need to do the view and update 2015-07-20 21:15:17 -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 775a38880e Revert "Starter controller for bulk edit/delete" 
This reverts commit 55309bfaef.
 2015-07-20 16:35:16 -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 abfb5bcd2e Change user list from email to username 2015-07-20 10:19:03 +09:30
madd15 5ff84d80b4 Change user list from email to username 2015-07-20 10:16:58 +09:30
madd15 e29ab6b0d6 Change user list from email to username 2015-07-20 10:16:26 +09:30
madd15 89df6fc6da Change user list from email to username 2015-07-20 10:15:28 +09:30
madd15 78a45d72d7 Add reassignable to create 2015-07-18 10:53:51 +09:30
snipe 55309bfaef Starter controller for bulk edit/delete 2015-07-17 14:13:27 -07:00
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
snipe 24b0d83387 Fixes #912 - added clon button to list view 2015-07-16 19:33:39 -07:00
madd15 1fcd36e4ac Change user list to include email address 2015-07-16 10:25:13 +09:30
madd15 31362f3e07 Change user list to include email address 2015-07-16 10:23:54 +09:30
madd15 0fbccef759 Change user list to include email address 2015-07-16 10:23:28 +09:30
madd15 2659521dc9 Change user list to include email address 2015-07-16 10:22:57 +09:30
madd15 0f489b34b5 Change user list to include email address 2015-07-16 10:22:19 +09:30
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
snipe 0154f240f3 Fixes JavaScript for edited assets 2015-07-10 22:48:21 -07:00
madd15 1e730078c1 Add file uploads to Users 2015-07-10 09:23:34 +09:30
snipe 1c2a409e6a Check that there is an assetstatus 2015-07-09 07:08:33 -07:00
snipe 15e1774a13 Centered checkboxes for select all 2015-07-09 03:57:20 -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 7255a8bb0c Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/controllers/admin/AssetsController.php
 2015-07-09 01:24:34 -07:00
snipe f5d4eb5842 Merge pull request #897 from madd15/patch-2 
Fix #896 - Only show Checkout/Checkin if deployable
 2015-07-09 01:19:57 -07:00
snipe 2d10931d6c Use league/csv for export 2015-07-08 23:42:17 -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 a22687abc5 Fix #896 - Only show Checkout/Checkin if deployable 2015-07-07 14:38:28 +09:30
madd15 8335f10f8c Add Checkout Button 2015-07-07 12:38:53 +09:30
madd15 f363e742e6 Add getFreeLicense 
Picks free seat for license and redirects to checkout specific seat
 2015-07-07 12:30:55 +09:30