DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
435 commits 101 branches 268 tags 320 MiB
Commit graph

435 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 15eb6df1db Add settings for alert interval threshold and inventory threshold 2016-05-19 19:33:53 -07:00
snipe 29e54830e1 Added 2D barcodes to labels 2016-05-19 19:12:42 -07:00
snipe 486d74fa64 Merge pull request #2052 from dmeltzer/remove-sentry-from-importer 
Get Rid of sentry code in importer
 2016-05-18 23:40:48 -07:00
Daniel Meltzer 592ce4c2de Readd sample.csv. Also port away from Sentry in the importer to be laravel5 compliant. 2016-05-18 23:33:18 -05:00
snipe 7fe020f836 Merge pull request #2051 from dmeltzer/importer-for-v3 
Importer for v3
 2016-05-18 20:59:26 -07:00
Daniel Meltzer 6b0bd52f5c Merge branch 'importer-for-v3' of github.com:dmeltzer/snipe-it into importer-for-v3 2016-05-18 22:41:58 -05:00
Daniel Meltzer 4f70fa88d9 Rename to snipeit:import 2016-05-18 22:40:02 -05:00
Daniel Meltzer 173c3de36a Add the asset to the cache after creating it as well. 2016-05-18 22:40:02 -05:00
Daniel Meltzer 2a56148ec2 Remove extraneuous htmlentities() calls, now that we call it in array_smart_fetch 2016-05-18 22:40:02 -05:00
Daniel Meltzer df749f26f5 Add the company/suppliers to the cache. This fixes some issues with duplicate items existing 2016-05-18 22:40:02 -05:00
Daniel Meltzer 191ae110d0 * Alphabetize the createOrFetch methods 
* Move the html escaping to array_smart_fetch to avoid duplication
* Ensure string comparisons have === everywhere
 2016-05-18 22:40:02 -05:00
Daniel Meltzer 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. 2016-05-18 22:40:02 -05:00
snipe b2b3b3d5ad Hide bulk attributes for components (for now) 2016-05-18 20:39:53 -07:00
Daniel Meltzer 4dc83035c8 Rename to snipeit:import 2016-05-18 22:38:19 -05:00
Daniel Meltzer 1e948eabc8 Add the asset to the cache after creating it as well. 2016-05-18 22:37:59 -05:00
Daniel Meltzer 3b6f78f30c Remove extraneuous htmlentities() calls, now that we call it in array_smart_fetch 2016-05-18 22:33:55 -05:00
Daniel Meltzer 2e5e956810 Add the company/suppliers to the cache. This fixes some issues with duplicate items existing 2016-05-18 22:29:44 -05:00
snipe 5333c7083a More dashboard fixes 2016-05-18 19:48:19 -07:00
snipe c1c7fa143d Components display on assets page 2016-05-18 19:26:50 -07:00
snipe fb26188e41 Fixed dashboard for components 2016-05-18 19:16:43 -07:00
snipe 47c70141c7 Gross copypasta fix for #1932 2016-05-18 19:08:16 -07:00
snipe 23e416fd88 Make site name required 2016-05-18 18:24:28 -07:00
snipe 4ba2b89940 Add MS Excel as export 
Excel does not work in Safari - known webkit issue, no fix :(
 2016-05-18 18:14:40 -07:00
snipe f363ff35c6 Additional bootstrap tables files 2016-05-18 18:14:15 -07:00
snipe 0780f97807 Add multisort to assets 2016-05-18 16:48:46 -07:00
snipe b0b7cfa999 Better handling for show/hide columns in depreciation report 2016-05-18 16:06:29 -07:00
snipe 7ee13113e0 Add depreciation name and months to depreciation report 2016-05-18 15:59:54 -07:00
snipe 0568e979e8 If permissions are blank, don't error out on json_decode 2016-05-18 14:38:17 -07:00
snipe 8f1c4138d1 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-05-17 21:16:18 -07:00
snipe 631aade6c4 Cleaned up language strings for categories 2016-05-17 21:16:12 -07:00
snipe 0ea5b090af Fixes issue with HTTPS key not found on non-HTTPS installs 2016-05-17 21:15:48 -07:00
snipe f9572ffa0c Fixes #2048 2016-05-17 21:15:29 -07:00
Daniel Meltzer e42cfc7601 * Alphabetize the createOrFetch methods 
* Move the html escaping to array_smart_fetch to avoid duplication
* Ensure string comparisons have === everywhere
 2016-05-17 21:47:38 -05:00
Daniel Meltzer 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. 2016-05-17 21:25:17 -05:00
snipe e13042a9e9 Merge pull request #2045 from dmeltzer/fix-installer-for-ubuntu 
Add support for Ubuntu 16.04
 2016-05-16 21:56:02 -07:00
snipe ed9c6183c1 Updated language files 2016-05-16 21:54:13 -07:00
Daniel Meltzer 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! 2016-05-16 23:22:33 -05:00
snipe e552c36a0a Add model_no, item_no, and manufacturer to consumables 2016-05-16 17:11:31 -07:00
snipe 63f4bbe412 Temporarily remove clone option from categories view 2016-05-14 18:06:49 -07:00
snipe f6c2f9d84e Uploads gitkeep 2016-05-14 17:49:03 -07:00
snipe 93294583f8 Clean up gitignore 2016-05-14 17:48:03 -07:00
snipe b5a1e261e5 Added gitkeep for users dir 2016-05-14 17:40:41 -07:00
snipe 0a2555ed2c Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-05-14 17:26:17 -07:00
snipe 8b072fddcf Fixes middleware for locale 2016-05-14 17:25:56 -07:00
snipe a6186ff5bc Merge pull request #2043 from snipe/docker-v3 
Docker v3
 2016-05-14 16:53:06 -07:00
Brady Wetherington 008482203e Fixes to Dockerfile, updated docker/develop.sh for new options. 2016-05-14 16:46:53 -07:00
snipe 415b60a293 Added check for setup in Setting model 2016-05-14 16:09:00 -07:00
Brady Wetherington f03ecd9d08 Update docker support for upcoming v3 2016-05-14 15:43:46 -07:00
snipe 5b829884b8 Remove commented out js 2016-05-14 15:06:27 -07:00
snipe 8b0393ab52 Fontawesome animations 2016-05-14 15:06:16 -07:00