DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
12924 commits 101 branches 268 tags 320 MiB
Commit graph

12924 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M 5afe024644 changed translation on asset acceptancen blade 2024-04-03 11:40:48 -07:00
Godfrey M c01bdb42fc renamed migration 2024-04-03 11:39:17 -07:00
Godfrey M e3ef8d295f Merge remote-tracking branch 'origin/add_decline_note_to_acceptance' into add_decline_note_to_acceptance 2024-04-03 11:37:05 -07:00
Godfrey M ce1d677cdc adds note to acceptance 2024-04-03 11:36:03 -07:00
Godfrey Martinez bcdda551b3
Merge pull request #12 from Godmartinz/remove_jquery 
removes jquery and updates translation
 2024-03-27 11:58:11 -07:00
Godfrey M bc66c0f223 removes jquery and updates translation 2024-03-27 11:56:47 -07:00
Godfrey M 21c3b1fbd2 rename declined message to note, increased width of textarea 2024-03-21 14:03:25 -07:00
Godfrey M b9986033cc removed abbr. of variable, changed variable types in migration 2024-03-18 16:03:40 -07:00
Godfrey M 8b52d5da85 fixed typos, reordered jquery, fixed migrations 2024-03-18 12:36:54 -07:00
Godfrey M 01afa9a749 declined notes are reflected in the action logs 2024-03-18 10:50:15 -07:00
Godfrey M 57f5d4a570 deleted_msg saves to db 2024-03-18 10:45:47 -07:00
Godfrey M 4588393b76 adds declined msg to mail notif, updates lang files and checkout acceptance controller 2024-03-18 10:25:55 -07:00
Godfrey M 0fd99d410e adds a text field and jquery to show/hide text field 2024-03-18 09:36:09 -07: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 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 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 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 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
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 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 ff10d1540f Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 10:00:00 +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
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 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 db92febdc7
Merge pull request #14392 from snipe/fixes/removed_unneeded_starts_with_validation_string 
Removed unneeded validation message
 2024-03-07 23:42:58 +00:00
snipe 5cf10cec34 Remloved unneeded validation message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-07 23:40:30 +00:00
snipe c66267a0f9
Merge pull request #14389 from Godmartinz/remove-pdf-for-old-labels 
old engine works as intended
 2024-03-07 21:06:57 +00:00
snipe f1d2f24534
Merge pull request #14388 from marcusmoore/bug/sc-25001 
Fixed attempting to run bulk actions on an empty asset collection
 2024-03-07 21:03:45 +00:00
Godfrey M d83974e07f old engine works as intended 2024-03-07 13:03:10 -08:00
Marcus Moore f270f30728
Redirect if no assets are returned from query 2024-03-07 12:30:08 -08:00