Commit Graph

  • f8ecbed829 Added purchase date to importer snipe 2015-07-17 16:25:20 -07:00
  • 9ac093e0be Merge remote-tracking branch 'origin/develop' snipe 2015-07-17 14:18:20 -07:00
  • 38c9d8d6ca Added notes/order number to asset view snipe 2015-07-17 14:18:08 -07:00
  • 4557502b1d Added notes/order number to controller snipe 2015-07-17 14:15:08 -07:00
  • 55309bfaef Starter controller for bulk edit/delete snipe 2015-07-17 14:13:27 -07:00
  • 0c842fc772 Fixes #863 - clickable order number in asset view snipe 2015-07-16 21:21:09 -07:00
  • 5210d7621e Merge remote-tracking branch 'origin/develop' into 2.0 snipe 2015-07-16 20:34:01 -07:00
  • b85d972488 Added mod rewrite to force SSL snipe 2015-07-16 20:32:10 -07:00
  • 919df7ed56 Part of #863 - adds order number to asset listing snipe 2015-07-16 19:54:56 -07:00
  • de62db5e18 Fixes #901 - added notes field to list view snipe 2015-07-16 19:45:10 -07:00
  • 24b0d83387 Fixes #912 - added clon button to list view snipe 2015-07-16 19:33:39 -07:00
  • dec3f290d0 Merge branch '2.0' of github.com:snipe/snipe-it into 2.0 snipe 2015-07-16 19:28:07 -07:00
  • 190b4cd010 Ignore couscous dir snipe 2015-07-16 19:27:48 -07:00
  • 61e16a4668 Merge remote-tracking branch 'origin/develop' snipe 2015-07-16 16:25:15 -07:00
  • e447159d4a Added checks for missing fields, added email column, asset notes snipe 2015-07-16 16:23:35 -07:00
  • b191406a0c Ignore couscous snipe 2015-07-16 14:58:22 -07:00
  • d732b60a38 Merge pull request #921 from madd15/Unique-Identifier-User-Lists snipe 2015-07-15 18:00:52 -07:00
  • ba94a57e08 Adjust Manager and Location width madd15 2015-07-16 10:26:53 +09:30
  • 1fcd36e4ac Change user list to include email address madd15 2015-07-16 10:25:13 +09:30
  • 31362f3e07 Change user list to include email address madd15 2015-07-16 10:23:54 +09:30
  • 0fbccef759 Change user list to include email address madd15 2015-07-16 10:23:28 +09:30
  • 2659521dc9 Change user list to include email address madd15 2015-07-16 10:22:57 +09:30
  • 0f489b34b5 Change user list to include email address madd15 2015-07-16 10:22:19 +09:30
  • 0642b4b830 Merge pull request #920 from madd15/patch-3 snipe 2015-07-15 17:34:59 -07:00
  • 8b77be9da3 Update for change to username on sign in madd15 2015-07-16 10:04:20 +09:30
  • 56345b5743 Fixes #909 - expired licenses showing in email report snipe 2015-07-13 20:59:02 -07:00
  • f09ee24975 Merge pull request #908 from madd15/license-delete-modal snipe 2015-07-13 09:22:51 -07:00
  • aed7036595 Merge pull request #907 from madd15/user-fileuploads snipe 2015-07-13 09:22:39 -07:00
  • 9fbb9746bc Merge pull request #895 from madd15/patch-1 snipe 2015-07-13 09:22:18 -07:00
  • 0154f240f3 Fixes JavaScript for edited assets snipe 2015-07-10 22:48:21 -07:00
  • dacbdd9aa5 Delete book.json snipe 2015-07-10 19:46:17 -07:00
  • a7abea692d Moved link for asset maintenances to the asset menu with the other items related to assets / hardware Vincent Sposato 2015-07-10 10:25:32 -04:00
  • f04b3f9b09 Change to LicenseSeat madd15 2015-07-10 10:02:46 +09:30
  • 2841eadc91 Add title and content to delete modal madd15 2015-07-10 09:57:03 +09:30
  • 616af831a7 Add title and content to delete modal madd15 2015-07-10 09:54:14 +09:30
  • 1e730078c1 Add file uploads to Users madd15 2015-07-10 09:23:34 +09:30
  • e1eb2da5f3 Create book.json snipe 2015-07-09 13:32:26 -07:00
  • 0132360e49 Added spinner to show activity during ajax snipe 2015-07-09 08:45:06 -07:00
  • 1c2a409e6a Check that there is an assetstatus snipe 2015-07-09 07:08:33 -07:00
  • 15e1774a13 Centered checkboxes for select all snipe 2015-07-09 03:57:20 -07:00
  • 16b49c25e1 Bringing back the spinner on processing screen snipe 2015-07-09 03:56:18 -07:00
  • c61adc7041 Partial fix for #851 datatables. Because clear error reporting is apparently for suckers snipe 2015-07-09 03:20:57 -07:00
  • 6524ac3678 Beginning of #851 - no controller methods yet, but still troubleshooting stupid datatables errors. snipe 2015-07-09 03:09:18 -07:00
  • c8842a85ee Bumped version v2.0-pre-beta snipe 2015-07-09 01:24:43 -07:00
  • 7255a8bb0c Merge remote-tracking branch 'origin/develop' into 2.0 snipe 2015-07-09 01:24:34 -07:00
  • f5d4eb5842 Merge pull request #897 from madd15/patch-2 snipe 2015-07-09 01:19:57 -07:00
  • 7e5f32c9d8 Merge pull request #898 from madd15/Default-Layout-fix snipe 2015-07-09 01:17:02 -07:00
  • e1724cf25f Merge remote-tracking branch 'origin/develop' into 2.0 v2.0-beta snipe 2015-07-09 01:02:49 -07:00
  • 9936cf4a43 Better production default for #903 snipe 2015-07-09 00:53:58 -07:00
  • e9443a244c Small fix to config value snipe 2015-07-09 00:52:05 -07:00
  • f8be47dfbf Fixes #903 - adds config variable for multi_login, overrides Sentry method snipe 2015-07-09 00:41:46 -07:00
  • 2d10931d6c Use league/csv for export snipe 2015-07-08 23:42:17 -07:00
  • 4a5066054b Display bugfixes for #819 snipe 2015-07-08 22:38:35 -07:00
  • 84ffc1a728 Migration for location-specific currency, updated views for #819 snipe 2015-07-08 20:35:40 -07:00
  • 74429d9075 Merge remote-tracking branch 'origin/develop' into 2.0 snipe 2015-07-08 18:07:53 -07:00
  • c2d63915c3 Fixed insecure font call snipe 2015-07-08 17:48:59 -07:00
  • fd59ca0802 Fixed spacing snipe 2015-07-08 17:33:51 -07:00
  • de23ec5785 Fixes #544 - disable checking an asset out to a user if it is not a deployable status snipe 2015-07-08 17:18:46 -07:00
  • 05f0b94bf6 Fixed language string snipe 2015-07-08 13:05:17 -07:00
  • f54c86db87 Command line asset importer snipe 2015-07-08 13:05:05 -07:00
  • e714def74a Fix Reports showing class="active" madd15 2015-07-08 11:46:11 +09:30
  • a9e169261c Add 5px margin to left of search box madd15 2015-07-08 11:41:14 +09:30
  • 665ffa6571 Update Hardware Submenu madd15 2015-07-08 11:37:20 +09:30
  • a22687abc5 Fix #896 - Only show Checkout/Checkin if deployable madd15 2015-07-07 14:38:28 +09:30
  • 2645acd827 First stab at custom fields - model side only, to start Brady Wetherington 2015-07-06 20:09:47 -07:00
  • 8335f10f8c Add Checkout Button madd15 2015-07-07 12:38:53 +09:30
  • 518680f23c Add freecheckout for getting first available seat madd15 2015-07-07 12:33:53 +09:30
  • 38c36699a7 Add freeSeat function madd15 2015-07-07 12:32:33 +09:30
  • f363e742e6 Add getFreeLicense madd15 2015-07-07 12:30:55 +09:30
  • 1edce0a4fa Merge branch '2.0' of github.com:snipe/snipe-it into 2.0 snipe 2015-07-06 19:29:22 -07:00
  • 7da7907fbd Merge remote-tracking branch 'origin/develop' into 2.0 snipe 2015-07-06 19:29:06 -07:00
  • 32a0f6eb92 Merge pull request #892 from madd15/patch-4 snipe 2015-07-06 18:07:30 -07:00
  • 1301119c9a Remove unique from modelno validation rule madd15 2015-07-07 09:50:43 +09:30
  • c7f2dc83db Remove $new and replace with Input::all() madd15 2015-07-07 09:50:00 +09:30
  • 82892a38b8 Merge pull request #891 from madd15/patch-3 snipe 2015-07-06 16:50:58 -07:00
  • 3664e75c47 Change validation to work correctly madd15 2015-07-07 08:51:38 +09:30
  • 61836f20c5 Clear Mac Address on Clone madd15 2015-07-07 08:23:51 +09:30
  • 62d382d704 Remove serial and assigned_to when cloning asset madd15 2015-07-07 08:19:58 +09:30
  • 3746bc333b Better checking for model name and category name snipe 2015-07-06 14:12:49 -07:00
  • ccde517c88 Use showAssetName to get asset name snipe 2015-07-06 14:10:24 -07:00
  • f855bfd4ef Better error checking for eol data snipe 2015-07-06 14:09:48 -07:00
  • 674348b5a5 Smaller text requirement for address2 snipe 2015-07-06 14:06:31 -07:00
  • 1b423f5b54 Fixed all issues that were reported by @leobg Also, renamed and fixed items of concern by @snipe Renamed Improvements to Asset Maintenances Vincent Sposato 2015-07-06 10:36:54 -04:00
  • 7d5810b656 Merge remote-tracking branch 'origin/develop' into 2.0 snipe 2015-07-02 17:23:06 -07:00
  • 1601bdd4eb Added rtd_location_id back into selected columns snipe 2015-07-02 16:52:08 -07:00
  • 552bdfdc2d Switched defaultLoc to belongsTo relationship snipe 2015-07-02 16:51:52 -07:00
  • d4af197b0e Merge pull request #886 from madd15/Fix---Edit-user snipe 2015-07-01 19:51:33 -07:00
  • be685467eb Merge pull request #883 from madd15/patch-2 snipe 2015-07-01 19:50:36 -07:00
  • 7a0b3a7350 Allow saving of Username and Email changes madd15 2015-07-02 12:16:01 +09:30
  • 55f544829d Update Category Types Array to include Consumable madd15 2015-07-01 17:28:58 +09:30
  • bb7ce83c48 Merge remote-tracking branch 'origin/develop' into 2.0 snipe 2015-06-30 22:42:00 -07:00
  • 1d4cfcfd58 Only save uploaded logo if not in demo mode snipe 2015-06-30 22:38:40 -07:00
  • 6915987239 Added demo language string snipe 2015-06-30 22:38:19 -07:00
  • 3a44a7e8bb Disable logo upload for demo snipe 2015-06-30 22:38:12 -07:00
  • f2abbd0e8f Deny editing users on demo snipe 2015-06-30 22:10:23 -07:00
  • 62f8d002e3 Temp commented out some stuff snipe 2015-06-30 22:05:21 -07:00
  • 0766ae2d17 Disallow group edit for demo snipe 2015-06-30 22:04:48 -07:00
  • 95920be8ea Fixed weird commenting snipe 2015-06-30 22:04:05 -07:00
  • 588ff742fe Add manufacturer to models listing for clarity snipe 2015-06-30 19:15:43 -07:00
  • a8cb5c1e7d Beginning QR mobile interface snipe 2015-06-30 19:07:44 -07:00