DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-20 04:24:23 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
15711 commits 97 branches 267 tags 296 MiB
Commit graph

15711 commits

This branch
This branch
All branches
Author SHA1 Message Date
tiagom62 3bbd49dbad Don't run composer as root (#5689) 
* dont run composer as root

* better naming
 2018-06-20 19:59:44 -07:00
Daniel Meltzer ad21857cae Update my email address across files. (#5716) 2018-06-20 01:59:59 -07:00
Daniel Meltzer 2d18b73138 Fix #5408. (#5715) 
The temporary password cannot be added to the users data until after do
any update-related logic, otherwise their password will be overwritten.
 2018-06-20 01:59:04 -07:00
Richard Ray Thomas e7bc18dad4 Fixed inconsistent or incorrect comment labels (#5691) 
Accessories table was labeled 'Checked out License table' likely just a duplicate of the above comment for the actual licenses table. Very minor.
 2018-06-11 20:11:58 -07:00
snipe 62e4eabab0 Fixed #5693 - don’t truncate license key 2018-06-11 18:47:02 -07:00
tiagom62 d204eebab9 Ubuntu Bionic Beaver 18.04 support (#5687) 
* bionic box

* bionic beaver support
 2018-06-09 11:21:28 -07:00
thelamer ed5823151b in order to avoid manual user intervention of running "php artisan migrate" before installation on a clean database pulling in migration scripts on startup if needed, also ownership of keys needs to be the docker user 2018-06-07 22:29:00 -07:00
snipe 968d7d1f11 Fixed #5354 - adds dd/mm/yyyy to localization 2018-06-05 15:30:50 -07:00
snipe 086683319a Fixed #5172 - autosum on assets detail view for components tab 2018-06-02 06:21:51 -07:00
snipe e5c1f4847d Added emoji to exempt list to match current labels 2018-06-01 13:55:39 -07:00
snipe 087e114d34 Merge branch 'develop' 2018-05-31 16:34:25 -07:00
snipe 5a6b8bb856 Make default custom field value null 2018-05-31 14:21:18 -07:00
snipe 102f567cb5 Fixed typo 2018-05-31 10:55:48 -07:00
snipe 1a64879b65 Only allow remote user settings to be saved if the app is not in demo mode 2018-05-31 10:55:48 -07:00
Brady Wetherington 4a0e5e4b88 Possible fix for oauth issue in Docker 2018-05-31 01:36:51 -07:00
snipe 01857fb056 Added created_at to file upload UI, added header/footer to files modal, fixed string for actions 2018-05-29 16:38:23 -07:00
snipe 3afe4938f9 Fixed #5616 - removed duplicate call to ekkoLightbox on asset view 
It’s already in the default blade
 2018-05-29 16:36:42 -07:00
snipe 9e0544e735 Fixed #5617 - incorrect url to fieldset editing 2018-05-29 10:41:46 -07:00
snipe 3993c6ad6b Use custom header color in emails 2018-05-29 10:23:39 -07:00
Brian Monroe 649563457d Added notes field to acessories and consumable checkout pages. Resolves request #5607. (#5608) 2018-05-28 14:30:18 -07:00
snipe 6ec75714f0 Force default srtorage engine 2018-05-22 14:57:05 -07:00
snipe 15916e6668 Allow checkout to non-user objects even if the object requires checkout 2018-05-21 17:35:04 -07:00
snipe 76d0562716 Added last name to expected checkin notification 
For non-US countries like Germany where it’s considered rude not to include last name
 2018-05-21 17:34:27 -07:00
snipe 2ecc4aead7 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-21 15:43:48 -07:00
snipe d8210847a4 Bumped version 2018-05-21 15:43:04 -07:00
snipe ece916e12f Merge branch 'develop' 2018-05-21 15:41:40 -07:00
snipe 1a29d4f60f Check for > 0 expected assets 2018-05-21 15:41:19 -07:00
snipe 11832daf5c Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-21 15:17:40 -07:00
snipe 79555f5647 Bumped version 2018-05-21 15:16:56 -07:00
snipe 1868013704 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-21 14:59:08 -07:00
snipe 39cc13f155 Bumped version 2018-05-21 14:58:16 -07:00
snipe e636875797 Merge branch 'develop' 2018-05-21 14:56:57 -07:00
snipe 260749337e Updated languages 2018-05-21 14:54:36 -07:00
snipe 20a3b556bb Removed log 2018-05-21 14:33:27 -07:00
Tim Bishop fa0c58e42a Don't install require-dev packages. (#5549) 
This is already set for a local composer install, but not a global
one. They should be consistent.
 2018-05-18 16:06:05 -07:00
snipe abbb94239d Add @doekman as a contributor 2018-05-18 16:05:12 -07:00
snipe d89ef43834 Make category counters ints 2018-05-18 16:05:12 -07:00
Doeke Zanstra f84ab2beda Fixed bug #5540 (#5550) 
Error message with button "Test LDAP" is empty #5540
 2018-05-18 16:04:34 -07:00
snipe 86d398abda Fixed category test 2018-05-18 14:58:06 -07:00
snipe 883c65981b More test fixes 2018-05-16 20:09:18 -07:00
snipe 8eb96efa13 Merge branch 'develop' 2018-05-16 19:38:23 -07:00
snipe e9973670ea Could should not be equal to 1 2018-05-16 19:38:02 -07:00
snipe ef8d2d06df Fixes #5519 - count() for php 7.2 2018-05-16 19:35:14 -07:00
snipe 0b5bb520a7 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-16 19:24:31 -07:00
lea-mink 233fb23cb8 Create asset maintenance - Added orange bar for required asset to edit view (#5520) 
* Added orange bar for required asset to edit view

* disable redirection to asset maintenances view

* Update - disable redirection to asset maintenances view
 2018-05-16 19:23:23 -07:00
snipe fa89f45cb8 Bumped hash 2018-05-16 19:22:59 -07:00
snipe 4c656c0321
De-normalize new counters from 4.3.0 (#5547) 
* Added de-norm counter migration for assets

* Renaming counter columns, since Eloquent has a magical *_count helper

* Added artisan command to sync counters (one-off)

* Update API to use de-normed fields

* Increment counters for checkin;/checkout

* Derp.

* Added request increment/decrementer

* Move increment for checkout to the Asset::checkout method

* Added “could take a while” message
 2018-05-16 19:20:43 -07:00
snipe 87c6ee2035 Importer test fixes 2018-05-16 19:05:00 -07:00
snipe aab190423f Partial fix for license+category tests 2018-05-16 18:35:11 -07:00
snipe 05e3e6bda6 Added indexes for speed 2018-05-14 20:27:56 -07:00