DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10161 commits 97 branches 266 tags 291 MiB
Commit graph

10161 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe 8ca71df7c9 Check for superuser 2016-05-14 15:05:35 -07:00
snipe 9a8e4a55e7 Check for DB table 2016-05-14 15:05:28 -07:00
snipe 1a14abed05 Check that the table exists 
Should probably find a way to handle this that doesn't require a DB call
 2016-05-14 15:05:20 -07:00
snipe 4dd3a95b6d Fix https detection 2016-05-14 15:04:59 -07:00
snipe beed74c0d0 Add extra tables for drop 2016-05-14 15:04:51 -07:00
snipe f4490b14f8 [Feature] Re-order custom fields (drag and drop) 2016-05-14 14:06:59 -07:00
snipe 72d54bdb88 Fixed formatting on license checkin/checkout 2016-05-12 21:03:53 -07:00
snipe a726934cde Fixed bulk delete+checkin for users 2016-05-12 21:01:31 -07:00
snipe ae0e7b9078 Updatd documentation links, use https 2016-05-12 18:06:19 -07:00
snipe 252b114b5f Fixed case sensitive model for status labels 2016-05-12 17:23:51 -07:00
snipe 73327d31e3 Updated backup paths for config variables in laravel-backups 3.7.0 2016-05-12 17:16:10 -07:00
snipe 1acfd525e8 Fixed stupid parse error 2016-05-12 17:12:52 -07:00
snipe cfe38322b9 Get backups to work again 
This is still a littlw wonky tho :(
 2016-05-12 17:11:26 -07:00
snipe 9cfde523b0 Updated laravel-backup package 
Files are still not being generated. Open a ticket with the package maintainer
 2016-05-12 16:54:07 -07:00
snipe 1773f671da Ignore laravel backups dir 2016-05-12 16:20:39 -07:00
snipe b9b8149234 Minor backups fixes 2016-05-12 16:20:23 -07:00
snipe 720274446e Fixes #1997 - save user groups without Sentry crap 2016-05-12 15:26:48 -07:00
snipe 6d91774943 [Feature Request] Fixes #2030 - allow asset name change on checkin 2016-05-12 12:34:44 -07:00
snipe a96947efa9 Possible fix for #2037 
via https://github.com/laravel/framework/issues/8565#issuecomment-151171239
 2016-05-12 12:06:22 -07:00
snipe 062cbeb18f Fixed bug in categories asset listing for hardware 2016-05-12 10:39:19 -07:00
snipe ae8a03fec3 Add manufacturer name/sorting/searching on assets 2016-05-12 10:38:57 -07:00
snipe c41b47902e Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-05-09 15:41:05 -07:00
snipe c56c398d4c Fixes #1996 - replace old Sentry methods with laravel native 2016-05-09 15:40:27 -07:00
snipe a144fb77cd Fixed hodor 2016-05-09 15:38:29 -07:00