DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 11:34:08 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15251 commits 96 branches 267 tags 296 MiB
Commit graph

15251 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
spencerrlongg f6ab0f8f46 lots of cleanup to do, but this DOES work 2024-03-13 15:57:10 -05:00
spencerrlongg f01b205486 some changes 2024-03-13 15:10:51 -05:00
Marcus Moore 592385cb07
Remove mediconesystems/livewire-datatables package 2024-03-13 11:58:03 -07:00
spencerrlongg 8962ced038 push to switch branches 2024-03-13 10:40:50 -05:00
snipe 85123b3e66 Rework print page 
Still seeing a weird error tho, not done yet

Signed-off-by: snipe <snipe@snipe.net>
 2024-03-13 12:36:17 +00:00
spencerrlongg 04d7884af8 some more testing stuff 2024-03-12 23:17:40 -05:00
spencerrlongg 6732b6601e some cool progress, but something with unique not working 2024-03-12 18:33:59 -05:00
Marcus Moore 0fcf223960
Add minimal validation for asset_tags 2024-03-12 12:00:10 -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 c5c6b3bbc6 Starting the revised print page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-11 14:23:25 +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
spencerrlongg eb8f1dd553 some cleanup 2024-03-09 12:29:26 -06:00
spencerrlongg c8341d9dc4 aha, got it working. 2024-03-08 19:48:47 -06:00
spencerrlongg b239b3a4db some good progress, lots of testing needs to be done on the new inclusion of SubstituteBindings 2024-03-08 18:24:41 -06:00
spencerrlongg 04e0a9d4a5 commented tests for now 2024-03-08 13:14:59 -06: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
snipe 0f63fa23e0 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	package-lock.json
 2024-03-08 09:08:29 +00:00
snipe 22ef569e5e Merge branch 'security/snyc_Upgrade-webpack-from-5.90.1-to-5.90.2_14395' into develop 2024-03-08 08:50:26 +00:00
snipe f3663f0983 [Snyk] Upgrade webpack from 5.90.1 to 5.90.2 #14395 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 08:45:49 +00:00
snipe 112ddaf55b
Merge pull request #14394 from marcusmoore/fixes/check-endpoint-is-set-for-checkout-in-notifications 
Ensure Chat and Teams endpoints are not blank before attempting to send webhook on checkout and check in
 2024-03-08 08:44:52 +00:00
snipe bda6fdf09c
Merge pull request #14395 from snipe/snyk-upgrade-9e465161f7c9fd096a214ca3ad2fae7b 
[Snyk] Upgrade webpack from 5.90.1 to 5.90.2
 2024-03-08 08:44:07 +00:00
snyk-bot a62198f33f
fix: upgrade webpack from 5.90.1 to 5.90.2 
Snyk has created this PR to upgrade webpack from 5.90.1 to 5.90.2.

See this package in npm:
https://www.npmjs.com/package/webpack

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-08 06:20:14 +00:00
Marcus Moore 4b0bfc52b4
Ensure webhook endpoint is set before attempting to send to google or microsoft 2024-03-07 18:10:10 -08:00
snipe 78868813b1 Merge remote-tracking branch 'origin/develop' 2024-03-08 01:05:07 +00:00
snipe e8be178ac7
Merge pull request #14393 from marcusmoore/bug/sc-24862 
Guard against checking require acceptance on non-existent relationship in accessory model
 2024-03-08 01:04:26 +00:00
Marcus Moore 695428cd44
Guard against unrelated category 2024-03-07 16:59:01 -08:00
snipe 9ae779e442 Merge remote-tracking branch 'origin/develop' 2024-03-07 23:44:30 +00:00