Commit Graph

507 Commits

Author SHA1 Message Date
snipe 84d81184fa Fixes #1009 - Add MAC address to search 2015-08-06 05:13:27 -07:00
snipe 449ad4f86b Fixes #1014 - error if no assets are unaccepted 2015-08-04 13:22:13 -07:00
snipe 3c730c691b Fixes #1010 - better errors on large file uploads 2015-08-04 12:45:17 -07:00
Vincent Sposato 24edf81b27 Merge branch 'feature/865_AssetsNotAcceptedReport' of github.com:vsposato/snipe-it into feature/865_AssetsNotAcceptedReport 2015-08-01 12:29:29 -04:00
Vincent Sposato b195934a4a Finished building out the report, and refactoring to make the code more expressive
Need to finish writing the code to track threads
2015-08-01 12:20:49 -04:00
Vincent Sposato 794dc5998a Working on the Actionlog and ReportsController - still having issues getting data back the way I want 2015-08-01 12:20:48 -04:00
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 e560cc2ee2 Working on the Actionlog and ReportsController - still having issues getting data back the way I want 2015-07-31 19:29:44 -04:00
snipe 305c22f72d Added request to dashboard 2015-07-30 14:59:24 -07:00
snipe 78835a8b1f Add requestable as bulk-edit option 2015-07-30 14:32:25 -07:00
snipe 948c443829 Fix for edit/clone 2015-07-29 20:50:23 -07:00
Vincent Sposato 8c30c5d879 Fixed issue in routes file 2015-07-29 19:09:32 -04:00
Michael Daniels 20f94ce418 Closing brackets are helpful 2015-07-29 14:27:03 -04:00
Michael Daniels cced7a93a5 Update AssetsController.php 2015-07-29 14:25:49 -04:00
Michael Daniels 6430f7a4a7 Update AssetsController.php 2015-07-29 14:24:30 -04:00
snipe 0c9018289b Fixes #970 2015-07-28 20:24:58 -07:00
snipe e4ad1011da Merge pull request #969 from snipe/inline_adding
Inline adding of dependent drop-down contents on asset-creation
2015-07-27 23:39:07 -07:00
Brady Wetherington de8180ec70 Abililty to inline-add things when you are creating a new asset 2015-07-27 23:27:45 -07:00
snipe 9184dd5303 Fix for sad action column with button wrapping 2015-07-27 15:28:41 -07:00
madd15 7aba5f3a84 Request #961 - Clone button on license list view 2015-07-28 07:33:51 +09:30
madd15 5e7bfe314a Fix missing ] 2015-07-27 21:20:19 +09:30
snipe a099d16714 Only send email if an email address was given 2015-07-26 22:08:26 -07:00
snipe b32e3a3475 Shwo username instead of email 2015-07-26 21:21:42 -07:00
Brady Wetherington 28304556a9 First pass at this, the ugly way. Just to see wha it looks like. 2015-07-26 18:15:06 -07:00
snipe 5701b4d38e Return accessories as well 2015-07-25 00:05:59 -07:00
snipe 23866bce26 Use redirect to route instead of back because POST 2015-07-24 23:08:33 -07:00
snipe 0f0dab556d Fixes #807 - bad link for subfolders 2015-07-24 22:48:29 -07:00
snipe 6dea227c3e Fixes #851 - bulk user delete 2015-07-24 22:37:15 -07:00
snipe 59b739c1c4 Fixes #902 - redirect to group listing page after group create 2015-07-24 17:43:33 -07:00
snipe fbb55c14d6 Merge remote-tracking branch 'origin/develop' into 2.0
# Conflicts:
#	app/controllers/admin/AssetsController.php
2015-07-24 15:56:10 -07:00
madd15 00bcae7feb Add email to postCheckin 2015-07-24 10:24:14 +09:30
madd15 6d96d6cba4 Add email to postCheckin 2015-07-24 10:22:54 +09:30
madd15 e3f0815012 Add Checkin_email to Create and Edit 2015-07-24 10:21:51 +09:30
madd15 d62d6ebf05 Add extra fields for email 2015-07-24 09:28:17 +09:30
madd15 e4277b47e8 Add extra fields for email 2015-07-24 09:27:44 +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
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
snipe e455b2af6e Only update email if password locking isn't set to true 2015-07-23 12:30:44 -07:00
snipe d26c40b26e Fixed issue where email not saved on edit 2015-07-23 12:28:26 -07:00
madd15 8ba55b4bf2 Fix missing checkedout_at 2015-07-23 12:40:22 +09:30
madd15 4375d66d09 Add Expected Checkin Date 2015-07-23 10:05:16 +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