DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-19 23:37:38 -07:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
12968 commits 90 branches 265 tags 290 MiB
Commit graph

12968 commits

This branch
This branch
All branches
Author SHA1 Message Date
snyk-bot 2de8a2e183
fix: upgrade bootstrap-table from 1.22.2 to 1.22.3 
Snyk has created this PR to upgrade bootstrap-table from 1.22.2 to 1.22.3.

See this package in npm:
https://www.npmjs.com/package/bootstrap-table

See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
 2024-03-19 19:52:12 +00:00
snipe 7070bad53b Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2024-03-18 12:32:22 +00:00
snipe da62d6af26
Merge pull request #14445 from snipe/fixes/check_for_valid_license_category_on_view_assets 
Make sure the category is still valid before displaying on view assets
 2024-03-18 12:30:15 +00:00
snipe d0d4d14787 Make sure the category is still valid before displaying on view assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 12:29:00 +00:00
snipe 09d69b214b
Merge pull request #14436 from marcusmoore/chore/sc-24901 
Organized notification test cases
 2024-03-18 12:20:23 +00:00
snipe 0e2aaebda4
Merge pull request #14406 from mauro-miatello/develop 
Hide/Show ecnrypted values when click on the lock icon
 2024-03-18 12:19:54 +00:00
snipe ec2c58163f
Merge pull request #14437 from marcusmoore/chore/sc-25070 
Removed dead test code
 2024-03-18 12:19:35 +00:00
Marcus Moore 948dc3c974
Remove duplicate trait 2024-03-14 13:11:53 -07:00
Marcus Moore 1afb724606
Remove commented (and old) test cases 2024-03-14 13:11:43 -07:00
Marcus Moore 451281d833
Delete test cases with only commented code 2024-03-14 13:11:27 -07:00
Marcus Moore 485f11c945
Move trait usage to parent TestCase 2024-03-14 12:56:49 -07:00
Marcus Moore dbc79655b0
Cleanup 2024-03-14 12:02:56 -07:00
Marcus Moore 02f6aa6161
Add group tag for new test case 2024-03-14 11:19:36 -07:00
Marcus Moore 07c5264b41
Organize email check in notifications test 2024-03-14 11:17:47 -07:00
Marcus Moore 7c178a6a78
Merge branch 'develop' into chore/sc-24901 
# Conflicts:
#	tests/Feature/Notifications/AssetWebhookTest.php
 2024-03-14 11:13:14 -07:00
snipe f56d53d7c1 Prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-14 17:14:33 +00:00
snipe 4cd4a936d8 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-14 15:43:47 +00:00
snipe 7bae4c39c6
Merge pull request #14401 from uberbrady/fix_locale_warning 
Fix [sc-25008] - correct and improve legacy language warnings
 2024-03-14 15:42:28 +00:00
snipe d55d95bbea
Merge pull request #14415 from Godmartinz/date_picker_z_order 
Fixed z-index of date-picker
 2024-03-14 15:39:11 +00:00
snipe 5e48d56561
Merge pull request #14427 from marcusmoore/bug/sc-25014 
Removes the unused `mediconesystems/livewire-datatables` package
 2024-03-14 15:35:53 +00:00
snipe 6a5098fb0c Merge remote-tracking branch 'origin/develop' 2024-03-14 13:26:38 +00:00
snipe 4e835e1772
Merge pull request #14430 from snipe/bug/sc-25066/fixed_requestable_search 
Move requestable scope below sorting, etc
 2024-03-14 13:25:44 +00:00
snipe cce8cb4f5e Move requestable scope below sorting, etc 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-14 13:24:22 +00:00
Marcus Moore 8aed26aab1
Remove unneeded test cases 2024-03-13 16:56:54 -07:00
Marcus Moore 01d5d4c2c8
Improve data provider name 2024-03-13 16:37:50 -07:00
Marcus Moore 592385cb07
Remove mediconesystems/livewire-datatables package 2024-03-13 11:58:03 -07:00
Godfrey M bf0bd06f20 put important back 2024-03-11 15:56:53 -07:00
Godfrey M f07b0b6bd7 removed important 2024-03-11 15:54:59 -07:00
Godfrey M 717b26c834 fixes z-index of date-picker 2024-03-11 15:53:59 -07:00
snipe 8bb8eab69b Merge remote-tracking branch 'origin/develop' 2024-03-11 15:00:38 +00:00
snipe 693d1c9452
Merge pull request #14413 from snipe/fixes/deprecation_on_strtoupper 
Fixed deprecation warning on `strtoupper()`
 2024-03-11 14:59:55 +00:00
snipe b049bb1d5c Check for null on select 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-11 14:55:49 +00:00
snipe 1df56a7cab
Merge pull request #14407 from snipe/bug/sc-25019_added_created_at_pivot 
Added created_at to license pivot
 2024-03-10 16:40:56 +00:00
snipe 3f5cc2507d Used updated_at instead 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 16:39:49 +00:00
snipe 5a85424295 Added created_at to license pivot 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 16:33:04 +00:00
snipe a53a8cca74 Merge remote-tracking branch 'origin/develop' 2024-03-10 14:40:41 +00:00
snipe 3fdee881f9
Merge pull request #14404 from snipe/fixes/Uninitialized-string-offset-0-in-labels 
Fixed uninitialized offset in labels in new label engine
 2024-03-10 14:40:12 +00:00
snipe a289dfaf88 Cleanup 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 14:33:53 +00:00
MrM 8abd359b5b
Script to hide / show encrypted values in web ui 
added a function to show/hide encrypted values with a simple trick because ClipboardJS can't copy display:none element's value
 2024-03-10 15:18:54 +01:00
MrM 9359809b4f
Hide / Show encrypted values in web ui 
added a span element to hide encrypted values
 2024-03-10 15:09:46 +01:00
snipe cde5502f94 Handle blank labels on asset label fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 14:03:21 +00:00
snipe 28ec0b8ebb Removed debugging console lines 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 17:19:31 +00:00
snipe 37dfecf098 Fixed uninitialized offset in labels 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 16:46:56 +00:00
snipe 9d8ce872a4 Merge remote-tracking branch 'origin/develop' 2024-03-08 14:56:21 +00:00
snipe 07880dfe50
Merge pull request #14400 from snipe/localizations/updated_strings 
Updated language strings, added Somali
 2024-03-08 14:07:32 +00:00
snipe 7eed9f8542 Added Somali 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 14:06:21 +00:00
Brady Wetherington a2e70dd6b2 Fix [sc-25008] - correct and improve legacy language warnings 
The legacy language warning was misfiring when a user's language
didn't match the APP_LOCALE from .env.

Additionally, we weren't properly warning when the legacy-language
came from Settings or from the user themselves. Both of which should
be impossible but still probably not a bad idea to warn on it, anyways
 2024-03-08 14:04:21 +00:00
snipe b9aeded957 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 14:01:34 +00:00
snipe 027361f079 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-03-08 10:01:21 +00:00
snipe ff10d1540f Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 10:00:00 +00:00