Commit Graph

  • 03818adc14 Added the new report to the sidebar of reports Vincent Sposato 2015-08-01 12:23:41 -04:00
  • b195934a4a Finished building out the report, and refactoring to make the code more expressive Need to finish writing the code to track threads Vincent Sposato 2015-08-01 11:55:47 -04:00
  • 82a80b9ac8 Added ThreadAssetLogs to the available artisan commands Vincent Sposato 2015-07-31 20:25:36 -04:00
  • 7c7edcd191 Created a threading command that will allow all of the asset logs to be threaded into groups Vincent Sposato 2015-07-31 20:24:34 -04:00
  • 794dc5998a Working on the Actionlog and ReportsController - still having issues getting data back the way I want Vincent Sposato 2015-07-31 19:29:44 -04:00
  • a2aa05fcf9 Fixed the migration for adding thread_id to correct the table name and make thread_id nullable Vincent Sposato 2015-07-30 21:02:57 -04:00
  • 8f68bdb318 Working through getting the dataset correctly from the asset logs so that we can generate a report Vincent Sposato 2015-07-27 16:31:53 -04:00
  • 239f438a98 Added a scope to the Category model to pull back only categories that required acceptance Vincent Sposato 2015-07-27 15:48:36 -04:00
  • 41127bf5dd Added scope to the Asset model to pull all assets that belonged to a list of models Vincent Sposato 2015-07-27 15:48:02 -04:00
  • 64bff852bd Added a scope to the Model model to allow for selecting only models that belong to a list of categories Vincent Sposato 2015-07-27 15:43:51 -04:00
  • d0a8dda14f Added ThreadAssetLogs to the available artisan commands Vincent Sposato 2015-07-31 20:25:36 -04:00
  • cc5bec07ea Created a threading command that will allow all of the asset logs to be threaded into groups Vincent Sposato 2015-07-31 20:24:34 -04:00
  • e560cc2ee2 Working on the Actionlog and ReportsController - still having issues getting data back the way I want Vincent Sposato 2015-07-31 19:29:44 -04:00
  • 37d4a0105e Fix for strict mode snipe 2015-07-31 11:15:17 -07:00
  • c74c89a171 Fixed the migration for adding thread_id to correct the table name and make thread_id nullable Vincent Sposato 2015-07-30 21:02:57 -04:00
  • 3bb296db78 Fixed language string for notes (when the hell did THAT break?) snipe 2015-07-30 15:10:59 -07:00
  • 305c22f72d Added request to dashboard snipe 2015-07-30 14:59:24 -07:00
  • 9f81792e70 Request button strings snipe 2015-07-30 14:52:55 -07:00
  • 57e21193c9 Added language strings for not requestable snipe 2015-07-30 14:50:06 -07:00
  • ce9d728c2d Updated controller to make sure the asset exists and is requestable snipe 2015-07-30 14:48:32 -07:00
  • 6bc2128c3e Added requestable button snipe 2015-07-30 14:48:19 -07:00
  • 78835a8b1f Add requestable as bulk-edit option snipe 2015-07-30 14:32:25 -07:00
  • 5297d699b3 Fix logo url madd15 2015-07-30 18:32:43 +09:30
  • 39da217a9e Fixed table nane for asset_logs in migration snipe 2015-07-29 22:47:24 -07:00
  • 948c443829 Fix for edit/clone snipe 2015-07-29 20:50:23 -07:00
  • 1a3bf10753 Merge pull request #989 from vsposato/feature/865_ThreadIdAddition snipe 2015-07-29 16:22:19 -07:00
  • 7876ae462c Added the migration for the thread_id on the asset_logs table Added the relationships for the self-referential links on thread_id Vincent Sposato 2015-07-29 19:03:46 -04:00
  • 8fbc77a844 Merge branch 'feature/865_AssetsNotAcceptedReport' of github.com:vsposato/snipe-it into feature/865_AssetsNotAcceptedReport Vincent Sposato 2015-07-29 19:13:12 -04:00
  • 87c493bf12 Added the migration for the thread_id on the asset_logs table Added the relationships for the self-referential links on thread_id Vincent Sposato 2015-07-29 19:03:46 -04:00
  • 8c30c5d879 Fixed issue in routes file Vincent Sposato 2015-07-29 19:09:32 -04:00
  • d8df6a0982 Added a scope to the Category model to pull back only categories that required acceptance Vincent Sposato 2015-07-27 15:48:36 -04:00
  • d6382fb4a3 Added scope to the Asset model to pull all assets that belonged to a list of models Vincent Sposato 2015-07-27 15:48:02 -04:00
  • 9772039c4f Added a scope to the Model model to allow for selecting only models that belong to a list of categories Vincent Sposato 2015-07-27 15:43:51 -04:00
  • ad6cec080c Merge branch '2.0' of https://github.com/snipe/snipe-it into 2.0 Vincent Sposato 2015-07-29 19:04:51 -04:00
  • 028cde8738 Merge pull request #987 from mdaniels5757/2.0 snipe 2015-07-29 12:06:14 -07:00
  • 20f94ce418 Closing brackets are helpful Michael Daniels 2015-07-29 14:27:03 -04:00
  • cced7a93a5 Update AssetsController.php Michael Daniels 2015-07-29 14:25:49 -04:00
  • 6430f7a4a7 Update AssetsController.php Michael Daniels 2015-07-29 14:24:30 -04:00
  • 1fff9f6048 Update macros.php Michael Daniels 2015-07-29 14:23:17 -04:00
  • 85a9f1b71f Merge pull request #1 from snipe/2.0 Michael Daniels 2015-07-29 14:21:57 -04:00
  • 43af451709 Merge pull request #971 from madd15/patch-3 snipe 2015-07-28 20:59:42 -07:00
  • 480fd78c51 Disllow delete if parent snipe 2015-07-28 20:45:32 -07:00
  • 0c9018289b Fixes #970 snipe 2015-07-28 20:24:58 -07:00
  • 65bf156da1 Better spacing for modal for elements snipe 2015-07-28 18:40:06 -07:00
  • 9122b49ecc Merge pull request #984 from madd15/patch-2 snipe 2015-07-28 18:20:02 -07:00
  • 35f97cceb7 Fix missing lists causing modal errors madd15 2015-07-29 10:34:21 +09:30
  • a8624a736d Merge pull request #983 from madd15/patch-1 snipe 2015-07-28 17:59:59 -07:00
  • c1ae844308 Fix #972 - Change back button to work madd15 2015-07-29 10:13:18 +09:30
  • 6c3d9048cf Merge pull request #982 from madd15/patch-4 snipe 2015-07-28 16:57:17 -07:00
  • 2507c1aa70 Correct Asset Count madd15 2015-07-29 09:26:44 +09:30
  • bb450e6bb6 Merge pull request #980 from snipe/inline_layout_fix snipe 2015-07-28 14:39:12 -07:00
  • 20eb2df9be Fix to nicen up the layout for the inline-adding and Bootstrapify it. Brady Wetherington 2015-07-28 14:25:47 -07:00
  • 1e38ced885 Nicer display of "add new" inline functionality. snipe 2015-07-28 11:58:45 -07:00
  • fe2fb63007 Localization strings for inline modals snipe 2015-07-28 11:31:08 -07:00
  • b79841d481 Fix for @uberbrady's missing route on inline adding snipe 2015-07-28 11:18:18 -07:00
  • 679b9f6def Small EOL fix madd15 2015-07-28 17:03:39 +09:30
  • 87cd77b4df Merge remote-tracking branch 'origin/2.0' into bootstrap-table-experiment snipe 2015-07-27 23:41:22 -07:00
  • e4ad1011da Merge pull request #969 from snipe/inline_adding snipe 2015-07-27 23:39:07 -07:00
  • d235ae19dc Merge pull request #968 from madd15/patch-3 snipe 2015-07-27 23:29:44 -07:00
  • de8180ec70 Abililty to inline-add things when you are creating a new asset Brady Wetherington 2015-07-27 23:27:45 -07:00
  • ed02d7daae Remove remnants of dataTables madd15 2015-07-28 15:57:21 +09:30
  • a28481cd8f Merge remote-tracking branch 'origin/develop' snipe 2015-07-27 23:10:40 -07:00
  • 5455abfd16 Fix for importer snipe 2015-07-27 23:10:03 -07:00
  • 4af635df28 NEVERMIND. snipe 2015-07-27 22:59:36 -07:00
  • a6d4b30df8 Make checkall work snipe 2015-07-27 22:50:01 -07:00
  • 4a51ff9ba5 Duh snipe 2015-07-27 22:46:13 -07:00
  • 22be076504 More experiments snipe 2015-07-27 22:39:47 -07:00
  • b85e9bb97f Add bootstrap extensions and export libs madd15 2015-07-28 13:59:34 +09:30
  • 5eedd7810f Create bootstrap-table.js madd15 2015-07-28 13:55:06 +09:30
  • 1ba798a35d Add bootstrap-table.css madd15 2015-07-28 13:53:29 +09:30
  • fc22c3884b Add bootstrap table js and css madd15 2015-07-28 13:51:53 +09:30
  • 0dc2a0ffac Change to bootstrap table compatable method madd15 2015-07-28 13:50:48 +09:30
  • ae91f829e1 Change to bootstrap table compatable method madd15 2015-07-28 13:50:10 +09:30
  • 80145c699e One more because I have teh dumb and cannot brain today snipe 2015-07-27 18:18:41 -07:00
  • f99cafc101 Fix for 0000-00-00 purchase date snipe 2015-07-27 17:16:28 -07:00
  • 4014f5e15b Bug in purchase date snipe 2015-07-27 17:11:46 -07:00
  • 3460016c94 Another small readme tweak snipe 2015-07-27 17:04:15 -07:00
  • e49c33b56b Minor documentation updates snipe 2015-07-27 17:02:55 -07:00
  • fdb31ac19e Small tweaks to import script snipe 2015-07-27 16:50:14 -07:00
  • 9184dd5303 Fix for sad action column with button wrapping snipe 2015-07-27 15:28:41 -07:00
  • 26e081a2cb Fixes #909 again, because math is super hard snipe 2015-07-27 15:26:53 -07:00
  • 66a198a175 Merge pull request #966 from madd15/patch-2 snipe 2015-07-27 15:07:52 -07:00
  • 7aba5f3a84 Request #961 - Clone button on license list view madd15 2015-07-28 07:33:51 +09:30
  • 78dcdb4dce Working through getting the dataset correctly from the asset logs so that we can generate a report Vincent Sposato 2015-07-27 16:31:53 -04:00
  • 3fdafe30c1 Added a scope to the Category model to pull back only categories that required acceptance Vincent Sposato 2015-07-27 15:48:36 -04:00
  • 39022c9766 Added scope to the Asset model to pull all assets that belonged to a list of models Vincent Sposato 2015-07-27 15:48:02 -04:00
  • e3a9145459 Added a scope to the Model model to allow for selecting only models that belong to a list of categories Vincent Sposato 2015-07-27 15:43:51 -04:00
  • 8d48fddac4 Merge pull request #956 from madd15/patch-1 snipe 2015-07-27 10:27:53 -07:00
  • 8b101b10ec Updated language files snipe 2015-07-27 10:25:35 -07:00
  • 8b5de894df Updated language files snipe 2015-07-27 10:24:21 -07:00
  • 5781a01311 Added English, Indonesian snipe 2015-07-27 10:24:08 -07:00
  • de1adf227b New language files snipe 2015-07-27 10:18:40 -07:00
  • 5e7bfe314a Fix missing ] madd15 2015-07-27 21:20:19 +09:30
  • 08ce08db62 Missing language strings for accept/decline snipe 2015-07-26 23:01:31 -07:00
  • 56504e07c9 More consistent language snipe 2015-07-26 22:55:09 -07:00
  • a901a648af Fixes #875 - allow user to decline asset and check asset back in if declined snipe 2015-07-26 22:53:48 -07:00
  • a099d16714 Only send email if an email address was given snipe 2015-07-26 22:08:26 -07:00
  • 464c83599b Nicer validation display on login screen snipe 2015-07-26 22:01:45 -07:00
  • c78355e39a Cleaned up login screen layout snipe 2015-07-26 21:58:03 -07:00
  • bc7c456f99 Added decline route snipe 2015-07-26 21:22:28 -07:00