Commit graph

16057 commits

Author SHA1 Message Date
Godfrey M
e8dc634a40 fixes translation usage 2024-03-19 14:30:53 -07:00
Godfrey M
0d0984a400 Bulk Delete Locations does not work [sc-25100] 2024-03-19 14:26:40 -07:00
spencerrlongg
86ab880c90 buncha progress 2024-03-19 15:34:59 -05:00
akemidx
8640cad033 was using lcoations and not locale. fixed 2024-03-19 16:11:32 -04:00
akemidx
dc29717623 fixing default 2024-03-19 15:51:05 -04:00
Godfrey M
866f0a9f56 syncs assets location to users location 2024-03-19 11:58:49 -07:00
snipe
814914924f Merge remote-tracking branch 'origin/develop' 2024-03-19 15:51:07 +00:00
snipe
c7083488b2
Merge pull request #14447 from snipe/feature/sc-25020_better_print_view
Add additional options to print all assigned view
2024-03-19 15:01:50 +00:00
snipe
4b4d383509 Removed - it’s for another PR
Signed-off-by: snipe <snipe@snipe.net>
2024-03-19 15:00:26 +00:00
Godfrey M
b9986033cc removed abbr. of variable, changed variable types in migration 2024-03-18 16:03:40 -07:00
akemidx
3680e04817 migration to set legacy locations to an standardized format 2024-03-18 18:29:59 -04:00
snipe
21e23baa37 Fixed ternary
Signed-off-by: snipe <snipe@snipe.net>
2024-03-18 21:28:46 +00:00
snipe
fcd130ae15 Layout improvements
Signed-off-by: snipe <snipe@snipe.net>
2024-03-18 21:17:46 +00:00
Godfrey M
8b52d5da85 fixed typos, reordered jquery, fixed migrations 2024-03-18 12:36:54 -07:00
Marcus Moore
d1dffb84dc
Remove InteractsWithSettings trait for remaining tests 2024-03-18 12:33:45 -07:00
Marcus Moore
541350916d
Merge branch 'develop' into chore/sc-25071
# Conflicts:
#	tests/Feature/Api/Users/UpdateUserApiTest.php
#	tests/Feature/Notifications/AccessoryWebhookTest.php
#	tests/Feature/Notifications/AssetWebhookTest.php
#	tests/Feature/Notifications/ComponentWebhookTest.php
#	tests/Feature/Notifications/ConsumableWebhookTest.php
#	tests/Feature/Notifications/LicenseWebhookTest.php
2024-03-18 12:33:31 -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
002fd4ce30 Nicer formatting for signoff
Signed-off-by: snipe <snipe@snipe.net>
2024-03-18 13:44:51 +00:00
snipe
7b4ecb275f Use trans choice for language
Signed-off-by: snipe <snipe@snipe.net>
2024-03-18 13:29:01 +00:00
snipe
2df5d3a8ff Fixed column selector
Signed-off-by: snipe <snipe@snipe.net>
2024-03-18 13:06:08 +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
Godfrey M
05a8d3030b correct column name 2024-03-16 19:54:48 -07:00
Godfrey M
595dad0f18 updates all assets assigned to user with new location 2024-03-16 19:51:40 -07:00
Marcus Moore
a28bee86ba
Extract method 2024-03-14 16:33:49 -07:00
Marcus Moore
fb64892971
Re-order 2024-03-14 16:26:27 -07:00
Marcus Moore
95ff692b14
Improve InteractsWithSettings name 2024-03-14 15:06:52 -07:00
Marcus Moore
8003615b1f
Move InteractsWithSettings to TestCase 2024-03-14 14:15:11 -07: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