Commit Graph

  • e54bbcd37f working on debian installer Walter 2015-11-04 21:14:19 -05:00
  • c1961c0e40 Merge pull request #1313 from mtucker6784/develop snipe 2015-11-04 15:26:25 -08:00
  • 11c2fcd094 Remove new window target Michael T 2015-11-04 16:10:27 -07:00
  • b856e7f2c6 Make Model column a hyperlink to access the model page. Michael T 2015-11-04 15:55:41 -07:00
  • 7a84d1061b Merge remote-tracking branch 'origin/develop' snipe 2015-11-04 14:04:23 -08:00
  • 56b50468d2 fixed packages for centos6 Walter 2015-11-04 16:01:25 -05:00
  • c7057f550f removed a var Walter 2015-11-04 10:08:04 -05:00
  • 037cda36b2 formatting Walter 2015-11-04 09:17:16 -05:00
  • f3de39efd6 syncing centos 6 and centos 7 Walter 2015-11-04 09:06:48 -05:00
  • af5c221385 Updated language strings v2.0.5-pre snipe 2015-11-04 03:42:37 -08:00
  • feb74806a8 Removed models override snipe 2015-11-04 01:08:17 -08:00
  • 14ba5a3b77 Fixes #1310 - adds version hash to table name to prevent cookie issues for folks who pull from dev snipe 2015-11-04 01:08:05 -08:00
  • bc8c8e4225 Fixes #1012 - more consistency in manufacturer view snipe 2015-11-04 00:48:53 -08:00
  • dc64ad55ee Fixed link to manufacturers view snipe 2015-11-04 00:37:43 -08:00
  • 7e2b4183f6 Added in/out to categories snipe 2015-11-04 00:37:27 -08:00
  • 0a843fa856 OMFG really? snipe 2015-11-04 00:18:22 -08:00
  • 5a687f280f One more currency tweak snipe 2015-11-04 00:15:35 -08:00
  • 4b2e7b9b06 Fixes #1013 - show location name on asset view page snipe 2015-11-04 00:13:48 -08:00
  • 1ac41a72ec Link to asset in asset maintenance screen snipe 2015-11-04 00:07:00 -08:00
  • 6e117efebd Fixed dumb indenting snipe 2015-11-03 23:58:12 -08:00
  • 17207ddea1 Fixed table cookie name snipe 2015-11-03 23:57:58 -08:00
  • 130b1b4f4a Converted category asset listing to bootstrap tables for #1266 snipe 2015-11-03 23:57:31 -08:00
  • 8a7981a4ae Updated currency array snipe 2015-11-03 22:49:34 -08:00
  • 90513b06f5 Removed duplicate UK/GB snipe 2015-11-03 22:23:33 -08:00
  • 750fc84592 Updated seeder with currency snipe 2015-11-03 22:22:10 -08:00
  • 2a43491792 Fixes #1291 on the asset view as well snipe 2015-11-03 22:19:58 -08:00
  • f4331f4498 Fixes #1291 - use location currency and fall back to defaul currency for asset maintenances snipe 2015-11-03 22:04:57 -08:00
  • 0d1544c3d6 Fixing some package issues and syntax errors Walter 2015-11-03 16:29:18 -05:00
  • 958672dfd3 Fixed missing vars and typos Walter 2015-11-03 14:12:21 -05:00
  • 7355fd9ebe Merge remote-tracking branch 'origin/develop' into develop Walter 2015-11-03 13:39:12 -05:00
  • 5df26f9b0a Fixed the ubuntu install portion that i broke Walter 2015-11-03 13:33:03 -05:00
  • a587b72c71 Fixed dumb indenting snipe 2015-11-02 20:11:26 -08:00
  • 0b0b55619b Fixes #1291 - Use current currency, or sane fallback snipe 2015-11-02 20:06:06 -08:00
  • a760a7575a Added user notes back in snipe 2015-11-02 19:28:51 -08:00
  • a86f0e6178 Bumped version snipe 2015-11-02 19:27:23 -08:00
  • 577c193661 Fixed bug in location import snipe 2015-11-02 19:27:07 -08:00
  • f147a0ff02 Fixed user table name snipe 2015-11-02 19:26:33 -08:00
  • 0745ec1502 Fixed scope for users snipe 2015-11-02 19:26:10 -08:00
  • 5bed0482b6 Bumped version snipe 2015-11-02 19:17:33 -08:00
  • 9731727095 Sorting for #1266 snipe 2015-11-02 19:17:20 -08:00
  • 769fb13282 Search on manager name for #1266 snipe 2015-11-02 18:37:16 -08:00
  • a9e1283a17 Added search on location parent for #1266 snipe 2015-11-02 18:36:49 -08:00
  • 5bb94c4b4e Added fields to location assets display snipe 2015-11-02 17:42:47 -08:00
  • 67a113cbf4 Additional fields for location assets display snipe 2015-11-02 17:41:58 -08:00
  • d0eed67c42 Fixed relationship to return actual assets snipe 2015-11-02 17:41:33 -08:00
  • 9cc542aea9 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2015-11-02 16:45:44 -08:00
  • 725ca04ac8 Bumped version snipe 2015-11-02 16:45:30 -08:00
  • e07dcf2598 Added location detail view snipe 2015-11-02 16:45:19 -08:00
  • 712e415f4d Updated deleted seats language snipe 2015-11-02 16:45:02 -08:00
  • c8551367cb Moved sample file so people can't accidentally import it snipe 2015-11-02 16:44:46 -08:00
  • 5c820d49a6 Fixes #1305 snipe 2015-11-02 16:44:17 -08:00
  • 9f12b6a084 Should be read to merge! Walter 2015-11-01 11:35:33 -05:00
  • 187ab53c18 centos > ubuntu :) Walter 2015-11-01 11:03:02 -05:00
  • e35de90806 Version checking should work now Walter 2015-11-01 10:57:25 -05:00
  • 800100c0cc working on centos 6 switch case Walter 2015-10-30 21:26:59 -04:00
  • fbd79fc943 Merge pull request #1298 from MicaelRodrigues/snipeMike snipe 2015-10-30 16:22:12 -07:00
  • 7e6d142c1f Moving more stuff to the tmp dir Walter 2015-10-30 00:00:07 -04:00
  • da17603be1 use tmp dir and set mariadb root pass Walter 2015-10-29 23:41:22 -04:00
  • 34530b209f working on case statement Walter 2015-10-29 22:54:26 -04:00
  • 760e2fca01 Changed from if/else to case statement Walter 2015-10-29 22:31:45 -04:00
  • d1e977b85a force sudo Walter 2015-10-29 22:10:56 -04:00
  • 21cc1e9aec more formatting Walter 2015-10-29 22:04:28 -04:00
  • 346090ebff removing un-needed echo Walter 2015-10-29 21:51:44 -04:00
  • 40ca02481d Working on formatting Walter 2015-10-29 20:54:49 -04:00
  • b39944b2d7 Create user on the fly from sucessful LDAP authentication, if it does not already exists. Micael Rodrigues 2015-10-28 22:59:48 +00:00
  • e0fccc8fc9 Possible fix for #1296? Can't reproduce locally snipe 2015-10-28 05:53:28 -07:00
  • 76968f7d48 Fixes asset model table sorting snipe 2015-10-28 03:23:55 -07:00
  • 5436d54aa0 Fixes #1290 - datatable broken for assets in model snipe 2015-10-28 02:10:04 -07:00
  • b6f4080b97 Fixes consumable detail view snipe 2015-10-26 14:36:55 -07:00
  • 09bcb137c4 Ugly fix for preventing errors if there is an invalid model (therefore no category) snipe 2015-10-23 21:22:42 -07:00
  • 8ec6b7e03a Basic location ordering for #1266 snipe 2015-10-23 21:19:22 -07:00
  • efddda8665 Fixed expected_checkin error on asset view snipe 2015-10-23 18:28:06 -07:00
  • 48e6ebe306 Make EOL not sortable anymore, since that sort doesn't work snipe 2015-10-23 18:15:27 -07:00
  • eb1335405b Order by last_checkout and expected_checkin for #1266 snipe 2015-10-23 17:59:21 -07:00
  • 8a1ffb9014 Save de-normed values for last checkout and expected_checkin snipe 2015-10-23 17:55:03 -07:00
  • ec4b2f114d Merge pull request #1283 from snipe/features/checkout_time snipe 2015-10-23 17:47:45 -07:00
  • 9a5edb3db7 Migration to add last_checkout and expected_checkin fields to Asset Brady Wetherington 2015-10-23 17:40:04 -07:00
  • f0557f8e1c Added expected Checkin scope snipe 2015-10-23 15:25:02 -07:00
  • 2953b395f2 Added order number to allowed sort columns snipe 2015-10-23 15:12:06 -07:00
  • e9050826ec Added order number if one is being searched on snipe 2015-10-23 14:49:58 -07:00
  • 20e7888bd9 Fixed expected checkin on view snipe 2015-10-23 14:36:20 -07:00
  • e93b53ad4c Updated maintenance mode message snipe 2015-10-23 14:35:42 -07:00
  • 0a3843393d Addec expected_checkout, fixed language calls to use blade syntax snipe 2015-10-23 14:35:31 -07:00
  • 60f403f555 Expected checkin is a date, not a datetime snipe 2015-10-23 14:29:00 -07:00
  • cf49920564 Fixes #1235 - 24 hour format for log snipe 2015-10-23 12:39:22 -07:00
  • a955d57c20 When edit blade is used for New Asset, need to account for no model being selected. Brady Wetherington 2015-10-22 11:21:15 -07:00
  • 63eca44789 Custom fields can be shown on the hardware list page. They can also be searched for. Brady Wetherington 2015-10-22 03:33:27 -07:00
  • aaf2c6fbce Updated licenses and unaccepted assets to use bootstrap tables for #1266 snipe 2015-10-22 03:28:12 -07:00
  • 9a63cbbd6c Removed download button snipe 2015-10-22 03:22:59 -07:00
  • 0aeab1ab7e Remove CSV export button snipe 2015-10-22 03:13:30 -07:00
  • 4c3a5a99df Use client-side bootstrap tables for reports snipe 2015-10-22 03:11:34 -07:00
  • 60370b9627 Added acceptance methods back in snipe 2015-10-22 03:10:43 -07:00
  • df986c7cfe Minor indenting edits snipe 2015-10-22 03:10:25 -07:00
  • a67951fbce Merge branch 'develop' into custom_fields Brady Wetherington 2015-10-22 02:30:30 -07:00
  • a3f5dc331d Fixes #1007 and #1053 snipe 2015-10-22 02:11:39 -07:00
  • af6a3dcccd Updated sample data snipe 2015-10-22 01:14:21 -07:00
  • 0f6de6a477 Asset editing works. Brady Wetherington 2015-10-22 01:06:35 -07:00
  • 5890d26545 Terribly rough Custom Fields creation Brady Wetherington 2015-10-22 00:38:07 -07:00
  • 7901b49503 Updated sample file snipe 2015-10-22 00:18:44 -07:00
  • 8ea40d4e6d Fixes default value for strict mode snipe 2015-10-22 00:17:45 -07:00