Commit Graph

  • 2a56148ec2 Remove extraneuous htmlentities() calls, now that we call it in array_smart_fetch Daniel Meltzer 2016-05-18 22:33:55 -05:00
  • df749f26f5 Add the company/suppliers to the cache. This fixes some issues with duplicate items existing Daniel Meltzer 2016-05-18 22:29:44 -05:00
  • 191ae110d0 * Alphabetize the createOrFetch methods * Move the html escaping to array_smart_fetch to avoid duplication * Ensure string comparisons have === everywhere Daniel Meltzer 2016-05-17 21:47:38 -05:00
  • 5821127a79 Update/port ObjectImportComandd to work with v3. Also change to do one big transactional commit instead of writing to db after each item. Went from a 2 minute import to a 5 second import for a 2000 item file. I still need to do some more santization of the input and work on error handling, but this seems to be in decent shape. Daniel Meltzer 2016-05-17 21:25:17 -05:00
  • b2b3b3d5ad Hide bulk attributes for components (for now) snipe 2016-05-18 20:39:53 -07:00
  • 4dc83035c8 Rename to snipeit:import Daniel Meltzer 2016-05-18 22:38:19 -05:00
  • 1e948eabc8 Add the asset to the cache after creating it as well. Daniel Meltzer 2016-05-18 22:37:59 -05:00
  • 3b6f78f30c Remove extraneuous htmlentities() calls, now that we call it in array_smart_fetch Daniel Meltzer 2016-05-18 22:33:55 -05:00
  • 2e5e956810 Add the company/suppliers to the cache. This fixes some issues with duplicate items existing Daniel Meltzer 2016-05-18 22:29:44 -05:00
  • 5333c7083a More dashboard fixes snipe 2016-05-18 19:48:19 -07:00
  • c1c7fa143d Components display on assets page snipe 2016-05-18 19:26:50 -07:00
  • fb26188e41 Fixed dashboard for components snipe 2016-05-18 19:16:43 -07:00
  • 47c70141c7 Gross copypasta fix for #1932 snipe 2016-05-18 19:08:16 -07:00
  • 23e416fd88 Make site name required snipe 2016-05-18 18:24:28 -07:00
  • 4ba2b89940 Add MS Excel as export snipe 2016-05-18 18:14:40 -07:00
  • f363ff35c6 Additional bootstrap tables files snipe 2016-05-18 18:14:15 -07:00
  • 0780f97807 Add multisort to assets snipe 2016-05-18 16:48:46 -07:00
  • b0b7cfa999 Better handling for show/hide columns in depreciation report snipe 2016-05-18 16:06:29 -07:00
  • 7ee13113e0 Add depreciation name and months to depreciation report snipe 2016-05-18 15:59:54 -07:00
  • 0568e979e8 If permissions are blank, don't error out on json_decode snipe 2016-05-18 14:38:17 -07:00
  • 8f1c4138d1 Merge branch 'v3' of github.com:snipe/snipe-it into v3 snipe 2016-05-17 21:16:18 -07:00
  • 631aade6c4 Cleaned up language strings for categories snipe 2016-05-17 21:16:12 -07:00
  • 0ea5b090af Fixes issue with HTTPS key not found on non-HTTPS installs snipe 2016-05-17 21:15:48 -07:00
  • f9572ffa0c Fixes #2048 snipe 2016-05-17 21:15:29 -07:00
  • e42cfc7601 * Alphabetize the createOrFetch methods * Move the html escaping to array_smart_fetch to avoid duplication * Ensure string comparisons have === everywhere Daniel Meltzer 2016-05-17 21:47:38 -05:00
  • fbed1a9d1a Update/port ObjectImportComandd to work with v3. Also change to do one big transactional commit instead of writing to db after each item. Went from a 2 minute import to a 5 second import for a 2000 item file. I still need to do some more santization of the input and work on error handling, but this seems to be in decent shape. Daniel Meltzer 2016-05-17 21:25:17 -05:00
  • e13042a9e9 Merge pull request #2045 from dmeltzer/fix-installer-for-ubuntu snipe 2016-05-16 21:56:02 -07:00
  • 390de7ae36 Merge remote-tracking branch 'origin/develop' snipe 2016-05-16 21:55:19 -07:00
  • 588f0a23ba Updated language strings snipe 2016-05-16 21:55:05 -07:00
  • ed9c6183c1 Updated language files snipe 2016-05-16 21:54:13 -07:00
  • 3e56ace3ee Add support for Ubuntu 16.04. Also rework version/os detection. This should work on centos, but I do not have an install to check with. Needs testing by someone that does! Daniel Meltzer 2016-05-16 23:22:33 -05:00
  • d40129bdae Merge remote-tracking branch 'origin/develop' snipe 2016-05-16 20:55:08 -07:00
  • 54f3c65624 Fixes #1634 - better handling for category listings that are not asset categories snipe 2016-05-16 20:53:51 -07:00
  • e552c36a0a Add model_no, item_no, and manufacturer to consumables snipe 2016-05-16 17:11:31 -07:00
  • 63f4bbe412 Temporarily remove clone option from categories view snipe 2016-05-14 18:06:49 -07:00
  • f6c2f9d84e Uploads gitkeep snipe 2016-05-14 17:49:03 -07:00
  • 93294583f8 Clean up gitignore snipe 2016-05-14 17:48:03 -07:00
  • b5a1e261e5 Added gitkeep for users dir snipe 2016-05-14 17:40:41 -07:00
  • 0a2555ed2c Merge branch 'v3' of github.com:snipe/snipe-it into v3 snipe 2016-05-14 17:26:17 -07:00
  • 8b072fddcf Fixes middleware for locale snipe 2016-05-14 17:25:56 -07:00
  • a6186ff5bc Merge pull request #2043 from snipe/docker-v3 snipe 2016-05-14 16:53:06 -07:00
  • 008482203e Fixes to Dockerfile, updated docker/develop.sh for new options. Brady Wetherington 2016-05-14 16:46:53 -07:00
  • 415b60a293 Added check for setup in Setting model snipe 2016-05-14 16:09:00 -07:00
  • f03ecd9d08 Update docker support for upcoming v3 Brady Wetherington 2016-05-14 15:43:46 -07:00
  • 5b829884b8 Remove commented out js snipe 2016-05-14 15:06:27 -07:00
  • 8b0393ab52 Fontawesome animations snipe 2016-05-14 15:06:16 -07:00
  • 8ca71df7c9 Check for superuser snipe 2016-05-14 15:05:35 -07:00
  • 9a8e4a55e7 Check for DB table snipe 2016-05-14 15:05:28 -07:00
  • 1a14abed05 Check that the table exists snipe 2016-05-14 15:05:20 -07:00
  • 4dd3a95b6d Fix https detection snipe 2016-05-14 15:04:59 -07:00
  • beed74c0d0 Add extra tables for drop snipe 2016-05-14 15:04:51 -07:00
  • f4490b14f8 [Feature] Re-order custom fields (drag and drop) snipe 2016-05-14 14:06:59 -07:00
  • 72d54bdb88 Fixed formatting on license checkin/checkout snipe 2016-05-12 21:03:53 -07:00
  • a726934cde Fixed bulk delete+checkin for users snipe 2016-05-12 21:01:31 -07:00
  • ae0e7b9078 Updatd documentation links, use https snipe 2016-05-12 18:06:19 -07:00
  • 252b114b5f Fixed case sensitive model for status labels snipe 2016-05-12 17:23:51 -07:00
  • 73327d31e3 Updated backup paths for config variables in laravel-backups 3.7.0 snipe 2016-05-12 17:16:10 -07:00
  • 1acfd525e8 Fixed stupid parse error snipe 2016-05-12 17:12:52 -07:00
  • cfe38322b9 Get backups to work again snipe 2016-05-12 17:11:26 -07:00
  • 9cfde523b0 Updated laravel-backup package snipe 2016-05-12 16:54:07 -07:00
  • 1773f671da Ignore laravel backups dir snipe 2016-05-12 16:20:39 -07:00
  • b9b8149234 Minor backups fixes snipe 2016-05-12 16:20:23 -07:00
  • 720274446e Fixes #1997 - save user groups without Sentry crap snipe 2016-05-12 15:26:48 -07:00
  • 6d91774943 [Feature Request] Fixes #2030 - allow asset name change on checkin snipe 2016-05-12 12:34:44 -07:00
  • a96947efa9 Possible fix for #2037 snipe 2016-05-12 12:06:22 -07:00
  • 062cbeb18f Fixed bug in categories asset listing for hardware snipe 2016-05-12 10:39:19 -07:00
  • ae8a03fec3 Add manufacturer name/sorting/searching on assets snipe 2016-05-12 10:38:57 -07:00
  • 8e18218652 [Bugfix] Fixed admin user display bug snipe 2016-05-11 21:36:59 -07:00
  • bf9aba3f20 Merge pull request #2007 from samepage-labs/docker_ubuntu_trusty snipe 2016-05-10 00:08:33 -07:00
  • 7e554a3c59 Merge branch 'develop' snipe 2016-05-09 16:03:49 -07:00
  • c41b47902e Merge branch 'v3' of github.com:snipe/snipe-it into v3 snipe 2016-05-09 15:41:05 -07:00
  • c56c398d4c Fixes #1996 - replace old Sentry methods with laravel native snipe 2016-05-09 15:40:27 -07:00
  • a144fb77cd Fixed hodor snipe 2016-05-09 15:38:29 -07:00
  • 2222aeacac Merge pull request #2012 from snipe/v3_fix_ubuntu_version_in_docker snipe 2016-05-05 12:46:26 -07:00
  • a2ebc0d983 Pin down Ubuntu version for dockerfile in v3 Brady Wetherington 2016-05-05 12:45:00 -07:00
  • 91ac9bd485 Merge pull request #2011 from snipe/fix_ubuntu_version_in_docker snipe 2016-05-05 12:44:54 -07:00
  • f16122070a Pin down Docker version to ubuntu:wily Brady Wetherington 2016-05-05 12:41:52 -07:00
  • 4803bc71ec Docker image requires ubuntu trusty, not latest Petr Baloun 2016-05-04 11:45:53 +02:00
  • d40289fbc9 Fixes #1997 and #1996 - replace sentry functions snipe 2016-04-28 21:59:43 -07:00
  • ba01b20ad4 Use updated redirect() reference snipe 2016-04-28 21:06:41 -07:00
  • 8dd0e72284 Remove erroneous comment snipe 2016-04-28 21:05:45 -07:00
  • d927aa3273 Fix delete method for groups snipe 2016-04-28 21:03:56 -07:00
  • a0bff94de3 Moved selectedPermissionsArray snipe 2016-04-28 20:57:07 -07:00
  • 7d8af579cf Updated controller with correct helper namespace snipe 2016-04-28 20:57:02 -07:00
  • 7783471cc3 Move selectedPermissionsArray to helper, since it can be used by users as well snipe 2016-04-28 20:56:47 -07:00
  • 8dc0dc0a07 Update permissions for cli user tool snipe 2016-04-28 20:56:27 -07:00
  • e6cbafe5ff Suppress console warning snipe 2016-04-28 20:19:31 -07:00
  • 7b489ad1ec Ability to suppress users from checkoutable list snipe 2016-04-28 20:19:22 -07:00
  • 449163c875 Fixes #1995 - updated group admin to use native permissions snipe 2016-04-28 14:03:54 -07:00
  • 97a91e2d83 Fix setting namespace snipe 2016-04-25 12:15:41 -07:00
  • f0a589f150 on forget password, show error message if user not found with email Tahsin Abrar 2016-04-24 17:55:32 +06:00
  • 898d9ad025 [Feature] Added Supplier and Assigned to in asset email alert snipe 2016-04-23 04:04:03 -07:00
  • b250e2b5f0 [Bugfix] Fixed escaping for email templates for L5.2 snipe 2016-04-23 04:03:26 -07:00
  • 32c193b9bf [Bugfix] Fixed Mail namespace snipe 2016-04-23 04:02:52 -07:00
  • c3b7332e3b [Bugfix] Fixed Mail namespace snipe 2016-04-23 04:02:40 -07:00
  • 96911b9e57 Fixes #1944 - add manufacturer to model list snipe 2016-04-23 03:34:49 -07:00
  • 3eb09871cf Fixed model name snipe 2016-04-23 03:12:39 -07:00
  • 1b5ef695f2 Add custom fields to modals in create asset snipe 2016-04-23 03:12:31 -07:00
  • 97e218541b Fixes date sanity check in checkout snipe 2016-04-23 02:36:21 -07:00
  • 30c6657fc1 Fixes date selector box snipe 2016-04-23 02:36:08 -07:00