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

1734 Commits

Author SHA1 Message Date
snipe b20fecc2de Make thread_id default null 2015-08-03 12:35:54 -07:00
Vincent Sposato 4082957c85 Added phpdocs to the model 2015-08-01 14:41:09 -04: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 03818adc14 Added the new report to the sidebar of reports 2015-08-01 12:23:41 -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 82a80b9ac8 Added ThreadAssetLogs to the available artisan commands 2015-08-01 12:20:48 -04:00
Vincent Sposato 7c7edcd191 Created a threading command that will allow all of the asset logs to be threaded into groups 2015-08-01 12:20:48 -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 a2aa05fcf9 Fixed the migration for adding thread_id to correct the table name and make thread_id nullable 2015-08-01 12:20:47 -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 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 d0a8dda14f Added ThreadAssetLogs to the available artisan commands 2015-07-31 20:25:36 -04:00
Vincent Sposato cc5bec07ea Created a threading command that will allow all of the asset logs to be threaded into groups 2015-07-31 20:24:34 -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 37d4a0105e Fix for strict mode 2015-07-31 11:15:17 -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
snipe 3bb296db78 Fixed language string for notes (when the hell did THAT break?) 2015-07-30 15:10:59 -07:00
snipe 305c22f72d Added request to dashboard 2015-07-30 14:59:24 -07:00
snipe 9f81792e70 Request button strings 2015-07-30 14:52:55 -07:00
snipe 57e21193c9 Added language strings for not requestable 2015-07-30 14:50:06 -07:00
snipe ce9d728c2d Updated controller to make sure the asset exists and is requestable 2015-07-30 14:48:32 -07:00
snipe 6bc2128c3e Added requestable button 2015-07-30 14:48:19 -07:00
snipe 78835a8b1f Add requestable as bulk-edit option 2015-07-30 14:32:25 -07:00
snipe 39da217a9e Fixed table nane for asset_logs in migration 2015-07-29 22:47:24 -07:00
snipe 948c443829 Fix for edit/clone 2015-07-29 20:50:23 -07: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
Vincent Sposato 8fbc77a844 Merge branch 'feature/865_AssetsNotAcceptedReport' of github.com:vsposato/snipe-it into feature/865_AssetsNotAcceptedReport 2015-07-29 19:13:12 -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
Vincent Sposato 8c30c5d879 Fixed issue in routes file 2015-07-29 19:09:32 -04:00
Vincent Sposato d8df6a0982 Added a scope to the Category model to pull back only categories that required acceptance 2015-07-29 19:05:56 -04:00
Vincent Sposato d6382fb4a3 Added scope to the Asset model to pull all assets that belonged to a list of models 2015-07-29 19:05:56 -04:00
Vincent Sposato 9772039c4f Added a scope to the Model model to allow for selecting only models that belong to a list of categories 2015-07-29 19:05:56 -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
Michael Daniels 1fff9f6048 Update macros.php 2015-07-29 14:23:17 -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
madd15 c1ae844308 Fix #972 - Change back button to work 2015-07-29 10:13:18 +09:30
Brady Wetherington 20eb2df9be Fix to nicen up the layout for the inline-adding and Bootstrapify it. 2015-07-28 14:25:47 -07:00
snipe 1e38ced885 Nicer display of "add new" inline functionality. 
TODO:

Handle validation failures in a less fugly way
 2015-07-28 11:58:45 -07:00
snipe fe2fb63007 Localization strings for inline modals 2015-07-28 11:31:08 -07:00
snipe b79841d481 Fix for @uberbrady's missing route on inline adding 2015-07-28 11:18:18 -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 80145c699e One more because I have teh dumb and cannot brain today 2015-07-27 18:18:41 -07:00
snipe f99cafc101 Fix for 0000-00-00 purchase date 2015-07-27 17:16:28 -07:00
snipe 4014f5e15b Bug in purchase date 2015-07-27 17:11:46 -07:00