DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 15:57:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
264 commits 89 branches 265 tags 290 MiB
Commit graph

264 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 6c6e65b8ca Fixes #2076 2016-05-24 09:46:43 -07:00
snipe 64d818e56e Fixed License and LicenseSeat namespaces for importer 2016-05-24 02:17:10 -07:00
snipe d6715914e1 Fixed supplier namespace 2016-05-24 02:13:28 -07:00
snipe f10b3b7cdb Fix for license importer 2016-05-24 01:51:47 -07:00
snipe f844bf4b41 Nicer focus handling for asset search 2016-05-24 01:10:05 -07:00
snipe 6e006a6873 Redundant top nav 2016-05-24 00:58:59 -07:00
snipe cb91829729 Fixed division by zero error 2016-05-24 00:49:56 -07:00
snipe fb35e40342 Search by asset tag 
Compatible with barcode scanners
 2016-05-20 17:02:28 -07:00
snipe b796e72faf Remove old search 2016-05-20 16:01:23 -07:00
snipe c56ceebb40 Default timezone back to UTC 2016-05-20 14:29:15 -07:00
snipe 78fc6dec3c Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-05-20 12:23:36 -07:00
snipe 7fd6051514 Fixes #2062 - old permissions masks to new 2016-05-20 12:23:31 -07:00
snipe 072923826d Merge pull request #2060 from dmeltzer/fix-settings-table-for-sqlite 
Fix updates from v2
 2016-05-20 10:52:00 -07:00
Daniel Meltzer c52e3b5f9c Check if the column exists before dropping. Also recreate the column in a rollback to make the migrations happy. Also break into two migrations to make sqlite happy. 2016-05-20 10:03:04 -05:00
snipe f6cdd90e41 New docs links in README 2016-05-20 01:44:24 -07:00
snipe 975b266cb0 Icon display on recent activity 2016-05-20 01:17:00 -07:00
snipe aad1ba4ab3 Updated language strings 2016-05-20 00:47:03 -07:00
snipe 6b5d0a5abf Translations and nicer formatting for login/password reset 2016-05-20 00:25:45 -07:00
snipe 6724489be2 Added additional dump variables 2016-05-19 23:37:36 -07:00
snipe be0a60e049 Updated strings 2016-05-19 23:27:08 -07:00
snipe 3d1f051e16 Remove demo login info 2016-05-19 23:21:01 -07:00
snipe 66beeeb26d Added notes back to asset file uploads 2016-05-19 23:12:27 -07:00
snipe 2c7b345ad2 Merge pull request #2057 from dmeltzer/fix-settings-table-for-sqlite 
Fix Settings Table for Sqlite
 2016-05-19 20:27:56 -07:00
Daniel Meltzer a6849fc689 Remove stray code from my commit and add a migration to fix the Settings issue the proper way. 2016-05-19 21:52:49 -05:00
snipe db6305bf1f Merge pull request #2056 from dmeltzer/make-categories-limit-work 
Make limit/offset work in getDataView
 2016-05-19 19:50:22 -07:00
snipe cbcc155f27 Settings tweaks 2016-05-19 19:49:25 -07:00
Daniel Meltzer 1148750c9a Make limit/offset work in getDataView 2016-05-19 21:45:48 -05:00
snipe c4a699f109 Validation for new alert settings 2016-05-19 19:43:05 -07:00
snipe 2b1bf9f7f3 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-05-19 19:34:11 -07:00
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