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

4043 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tim Bishop 1f299ed73e Fix padding on next page with Chrome. (#5509) 
It looks like Chrome (and probably other browsers) is optimising the
next-padding div out since it has no content. This means the margin
doesn't apply. Adding the nbsp, and making sure it takes up no space
itself, is enough to make the margin do the right thing.

I also tried using padding instead of margin, but this results in an
extra page at the end of the output (there'd need to be a way to stop
page-break and next-padding appearing at the end of the document). I also
tried setting a min-height on next-padding, but this had the same issue.
 2018-05-09 17:00:36 -07:00
snipe 4ba9792fbe Merge branch 'develop' 2018-05-09 15:29:59 -07:00
snipe f405511b6b Fixed #5501 - regression disallowing license files to be downloaded 2018-05-08 14:24:51 -07:00
snipe 8ad5eb3e59 Fixed #5500 - present() on correct location value 2018-05-08 09:21:43 -07:00
snipe 3df8fa99f0 Merge branch 'develop' 2018-05-08 07:37:44 -07:00
snipe cca97341e9 More flexible date range in datepicker for expected checkin filter on custom reports 2018-05-08 07:37:18 -07:00
snipe 13195d06fd Fixed #5491 - added default location filter for custom report 2018-05-08 07:34:14 -07:00
snipe 9b6e86b55c Merge branch 'develop' 2018-05-08 05:59:54 -07:00
snipe 65cf7527b0 Added model name to expected checkin reminders 2018-05-08 05:59:34 -07:00
snipe f74d50439c Merge branch 'develop' 2018-05-08 05:39:28 -07:00
snipe 28e7ca5a84 Formatting tweaks to email notifications 2018-05-08 05:39:11 -07:00
snipe 8f64da5bc7 Added admin alert on expiring notifications 2018-05-08 05:27:03 -07:00
snipe 25f537e730 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-08 03:49:28 -07:00
snipe 6d8af3d9c0 Bumped hash 2018-05-08 03:48:35 -07:00
snipe e56a46882d Include EULA/acceptance in license interfaces 2018-05-08 03:47:28 -07:00
snipe 0476ffecdb Removed debugging comments 2018-05-08 03:46:48 -07:00
snipe 47a0400a72 Fixed comment typo 2018-05-08 03:14:25 -07:00
snipe de3417d557 Added link to SnipeitPS powershell wrapper 2018-05-08 01:34:53 -07:00