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

6056 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe aa6b1456b2 Added help text to custom fields headline 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-20 15:29:43 -07:00
snipe b2de0d4ade Changed “Asset Categories” to “Categories” since there are more than asset categories now 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-20 15:29:22 -07:00
snipe c17eaaad69 Check that the field is valid before checking to see count() 
This mostly affects the demo, since the seeder updates info often

Signed-off-by: snipe <snipe@snipe.net>
 2021-04-20 15:10:28 -07:00
snipe e286ff0be3 Added show() redirect for CustomFields::show() 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-20 15:09:23 -07:00
snipe 83200d3cbd Merge remote-tracking branch 'origin/develop' 2021-04-20 14:55:48 -07:00
snipe d40fe1b683 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-04-20 14:54:29 -07:00
Brady Wetherington 2a28f5e66c
(Maybe?) Fixes the problem where we always need LDAP enabled (#9321) 
* I *think* this fixes the problem where we need LDAP even if we aren't using it?

* Pull the LdapAd dependency out of the AuthController constructor
 2021-04-20 14:53:47 -07:00
snipe dd1a5681da Add @psarossy as a contributor 2021-04-20 14:53:10 -07:00
Peter Sarossy cacb707a7f
Added #9355: include Accessories and Consumables on the location reports (#9356) 2021-04-20 14:53:04 -07:00
snipe e92f69dcda Add @zybersup as a contributor 2021-04-20 14:52:29 -07:00
Supapong Areeprasertkul b28b245acc
Update labels.blade.php (#8441) 
- Make the qr_size bigger when no barcode printed.
- BUG: Missing unit of font size for .qr-text class.
- Reduce padding-right to remove the additional space above text when print from Google Chrome. (I do not know the cause. I tried "box-sizing: border-box" without success.)
 2021-04-20 14:52:17 -07:00
Michael Pietsch 15e729f4b8
fix css when not runnin in webroot directory (#9445) 
Co-authored-by: Michael Pietsch <skywalker-11@mi-pietsch.de>
 2021-04-20 14:49:57 -07:00
snipe 3138f45e8c Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-04-20 14:49:38 -07:00
snipe 3e471a6587 Add @sh1hab as a contributor 2021-04-20 14:49:31 -07:00
Masudul Haque Shihab f3831fe010
Fixed #9447 change route parameter name in locations view (#9456) 2021-04-20 14:49:05 -07:00
Ivan Nieto Vivanco 36bc47c61c
Handle regex format when assigned from API (#9443) 2021-04-20 14:44:47 -07:00
snipe e4acf8d795 Merge remote-tracking branch 'origin/master' into develop 2021-04-20 14:44:01 -07:00
snipe b562f38729 Removed printerClass="NunoMaduro\Collision\Adapters\Phpunit\Printer" 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-19 10:51:29 -07:00
snipe e8adf8d44c One more category fix 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-14 16:57:55 -07:00
snipe b693e5202b Check for category name 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-14 16:54:36 -07:00
snipe 415ae5854f Add @Skywalker-11 as a contributor 2021-04-14 15:15:57 -07:00
snipe e1c6d4ced7 Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Requests/SettingsSamlRequest.php
 2021-04-14 15:15:07 -07:00
snipe 252b2ee1b4 Add @Jelle-S as a contributor 2021-04-14 15:07:40 -07:00
snipe 39b0f464d2 Adds ID columns to tables that don’t have them - reproduces #9363 
This reproduces #9363 without the PK in custom fields

Signed-off-by: snipe <snipe@snipe.net>
 2021-04-14 15:07:11 -07:00
snipe 2c0438bdcb Add @andreaci as a contributor 2021-04-14 11:18:13 -07:00
snipe 2986765a68 Implements #9373 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-14 11:17:59 -07:00
snipe f19595f525 Add @deivishome as a contributor 2021-04-14 10:27:08 -07:00
snipe 465ec054d3 Add @limeless as a contributor 2021-04-14 10:22:58 -07:00
theburger 785b1ad5a6
Update snipeit.sh php version from 7.1 to 7.4 (#9407) 
Snipe-it 5.2.x is required PHP 7.4 or above,
update script to install PHP 7.4 instead of 7.1

## Changed
- PHP to install in script is changed to 7.4 from 7.1
- Add `''`at DB_PASSWORD when configuring `.env` file
 2021-04-14 10:22:31 -07:00
snipe ab8f7e7b84 Add @Joly0 as a contributor 2021-04-14 10:21:18 -07:00
Joly0 31b2287a57
Update print.blade.php (#9426) 
Fixes #9418
 2021-04-14 10:20:36 -07:00
Godfrey Martinez 5fab1d6f0d
FIxes Sum of purchase cost of components not taking quantity into account in Asset View > Components tab (#9424) 
* git commit -m

* added text
 2021-04-14 10:19:40 -07:00
Godfrey Martinez 246cc0eaa8
Feature/ch16172/adding other fields to ldap sync settings (#9416) 
* new branch, added manager as an additional field. Currently having DB issues

* WIP DB Issue with eloquent

* added department to LDAP sync

* removed unused variables
 2021-04-14 10:17:57 -07:00
snipe ce1d3284b0 Buld assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-14 10:12:14 -07:00
Brady Wetherington bf344fd707 Merge branch 'develop' 
mix-manifest I just picked one.
version.php will get bumped by hand
bootstrap table seems to just be another copy? Added it back.
 2021-04-14 09:58:21 -07:00
Ivan Nieto Vivanco 9cf5fbd675
Logic added to handle when a cloned user is imported via LDAP. (#9429) 2021-04-14 09:19:25 -07:00
Ivan Nieto Vivanco 3824a50e8b
Fixes an issue with CSS when the 'skin' value in settings table is empty. (#9423) 2021-04-12 20:37:02 -07:00
snipe b6006769c3 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 21:02:05 -07:00
snipe bf2479c5d9 Fixed url to user-ridden style 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 20:36:13 -07:00
snipe 7ddcc97e79 Generated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 20:35:58 -07:00
snipe ba92d751a3 Removed depreciated Input:: facade 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 20:28:05 -07:00
Brady Wetherington 6b86e2a58f Rebuilt all assets after all commits had landed 2021-04-06 20:16:59 -07:00
Brady Wetherington 792a31cc7f Merge branch 'develop' 2021-04-06 20:10:22 -07:00
snipe e47e2e3754 Fixed #9404 - include note in accessory API 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 10:57:30 -07:00
snipe 105f57e059 Possible fix for Docker failing on master 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 06:09:04 -07:00
snipe 390403ddb7 Fixed #9370 - listbox custom fields not decryoted on edit 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 05:59:31 -07:00
snipe 7da32443ff Move develop fixes to master 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 05:05:16 -07:00
Brady Wetherington 72806cf8db
Fix up docker build on develop branch (#9401) 2021-04-05 22:13:31 -07:00
Serkan 0e34e43abb
The return early pattern applied to improve readability. (#8894) 2021-04-05 22:03:15 -07:00
snipe 981b503653 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-04-05 22:01:35 -07:00