snipe
|
c711278b8b
|
Merge pull request #16486 from marcusmoore/bug/sc-28639
Fixed location being automatically populated on asset checkin screen
|
2025-03-12 23:26:08 +00:00 |
|
snipe
|
eb9cfbaed6
|
Merge pull request #16498 from snipe/develop
Merge develop into master
|
2025-03-12 23:23:44 +00:00 |
|
snipe
|
ff637f1926
|
Merge pull request #16497 from marcusmoore/fixes/diff-in
Fixed various carbon displays
|
2025-03-12 23:17:48 +00:00 |
|
Marcus Moore
|
4d978e0fc6
|
Fix eol rate in upcoming audit notification
|
2025-03-12 16:04:16 -07:00 |
|
Marcus Moore
|
167001ed54
|
Fix eol rate in tests
|
2025-03-12 16:01:32 -07:00 |
|
Marcus Moore
|
25fb1abc95
|
Fix eol rate in AssetObserver
|
2025-03-12 15:58:11 -07:00 |
|
Marcus Moore
|
658bef447d
|
Fix eol rate in Actionlog
|
2025-03-12 15:55:13 -07:00 |
|
Marcus Moore
|
a28ff22d03
|
Fix eol rate in ReportsController
|
2025-03-12 15:44:06 -07:00 |
|
Marcus Moore
|
63a1ee0047
|
Fix eol rate in AssetMaintenancesController
|
2025-03-12 15:38:54 -07:00 |
|
Marcus Moore
|
ab8f4454d1
|
Add failing test for updating asset maintenance
|
2025-03-12 15:38:46 -07:00 |
|
Marcus Moore
|
e439f1f42b
|
Fix eol rate in AssetMaintenancesController
|
2025-03-12 15:35:46 -07:00 |
|
Marcus Moore
|
9be27bdf07
|
Add failing test for creating asset maintenance
|
2025-03-12 15:35:14 -07:00 |
|
snipe
|
faeb037ff9
|
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/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2025-03-12 21:26:34 +00:00 |
|
snipe
|
bfc122469c
|
Merge pull request #16495 from snipe/add_highlight_for_low_qty
Added highlight to items when the remaining is less than the min_amt
|
2025-03-12 21:23:15 +00:00 |
|
snipe
|
036c225dcf
|
Fixed dashboard string
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-12 21:22:24 +00:00 |
|
snipe
|
083cf78305
|
Added footer style for nicer number cell padding
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-12 21:17:41 +00:00 |
|
Marcus Moore
|
824271078e
|
Fix eol rate in AssetsController
|
2025-03-12 13:55:12 -07:00 |
|
Marcus Moore
|
1122cd8567
|
Fix eol rate in asset transformer
|
2025-03-12 13:33:15 -07:00 |
|
Marcus Moore
|
6cf7df22cd
|
Fix eol rate on asset show page
|
2025-03-12 13:28:34 -07:00 |
|
snipe
|
7421d089ff
|
Added formatter and centering in presenters
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-12 20:25:00 +00:00 |
|
snipe
|
bdb4bd73d2
|
Return an indicator for no value set
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-12 20:18:51 +00:00 |
|
snipe
|
bf88597132
|
Added qtySumFormatter and made seats formatter more generic
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-12 20:14:23 +00:00 |
|
snipe
|
dfacd876d5
|
Added remaining/min_amt to transformers
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-12 20:13:15 +00:00 |
|
snipe
|
07602f697d
|
Merge remote-tracking branch 'origin/develop'
|
2025-03-12 18:13:22 +00:00 |
|
snipe
|
dbe78c30d5
|
Merge pull request #16491 from snipe/bug/sc-28671
Fixed new user modal pre-populating with first name and last name of acting user
|
2025-03-12 18:05:57 +00:00 |
|
snipe
|
c1601b9a8c
|
Updated tests
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-12 17:28:50 +00:00 |
|
snipe
|
aa8e9f61d2
|
Check for value override
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-12 17:28:44 +00:00 |
|
snipe
|
163ddc8026
|
Check for value override
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-12 17:28:29 +00:00 |
|
snipe
|
c73dba4a43
|
Better visual spacing
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-12 17:28:05 +00:00 |
|
snipe
|
5e61a814a7
|
Merge pull request #16489 from marcusmoore/bug/sc-28644
Fixed timestamp in action log for bulk accessory check in
|
2025-03-12 14:56:52 +00:00 |
|
Marcus Moore
|
b5fa538a54
|
Set created_by correctly in he action log
|
2025-03-11 16:05:02 -07:00 |
|
snipe
|
11abb0fdb1
|
Merge remote-tracking branch 'origin/develop'
|
2025-03-11 22:13:34 +00:00 |
|
snipe
|
fcdc1494c2
|
Merge pull request #16443 from azmcnutt/feature/labels_Avery_5520_1DBarcode
Nice work! Thank you!
|
2025-03-11 22:12:09 +00:00 |
|
snipe
|
badb367e74
|
Merge pull request #16445 from ubc-cpsc/bugfix/CVE-2025-27515
Fixes CVE-2025-27515: Laravel has a File Validation Bypass
|
2025-03-11 21:55:58 +00:00 |
|
snipe
|
2960a13772
|
Upgrade webpack from 5.97.1 to 5.98.0 #16461
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-11 21:24:44 +00:00 |
|
snipe
|
deeb2fa543
|
Merge remote-tracking branch 'origin/develop'
|
2025-03-11 21:14:12 +00:00 |
|
snipe
|
5e10c213f6
|
Merge pull request #16488 from marcusmoore/bug/sc-28631
Nice catch!
|
2025-03-11 21:05:46 +00:00 |
|
snipe
|
b61eacbdab
|
Merge pull request #16473 from marcusmoore/chore/replace-form-close
Replaced call to Form::close()
|
2025-03-11 20:47:08 +00:00 |
|
Marcus Moore
|
e2f643e7ed
|
Backfill tests
|
2025-03-11 13:46:21 -07:00 |
|
Marcus Moore
|
9cbcfba4e9
|
Add test
|
2025-03-11 13:35:50 -07:00 |
|
Marcus Moore
|
fd854072b0
|
Properly handle route model bound LicenseSeat not being found
|
2025-03-11 13:03:00 -07:00 |
|
Marcus Moore
|
18b208bba2
|
Account for missing location
|
2025-03-11 11:46:38 -07:00 |
|
Marcus Moore
|
71d93ca3c3
|
Use dedicated location select component
Copy/paste/modify from partials.forms.edit.location-select
|
2025-03-11 11:41:26 -07:00 |
|
Marcus Moore
|
bac2760c6d
|
Replace Form::close
|
2025-03-10 12:55:35 -07:00 |
|
snipe
|
33c9ea4bb1
|
Merge pull request #16065 from marcusmoore/chore/migrate-select-helper
Convert Form::select to blade component
|
2025-03-07 01:05:58 +00:00 |
|
Marcus Moore
|
d88fe1f48a
|
Merge branch 'develop' into chore/migrate-select-helper
|
2025-03-06 13:39:05 -08:00 |
|
Marcus Moore
|
f202817852
|
Use translation strings
|
2025-03-06 12:43:59 -08:00 |
|
Joël Pittet
|
618d81777a
|
Fixes CVE-2025-27515
|
2025-03-06 12:33:29 -08:00 |
|
James M
|
0b6d810ca6
|
FEAT: Add Label 5520 with 1D barcode - remove 2D barcode
FEAT: Add Label 5520 with 1D barcode - remove 2D barcode
|
2025-03-06 11:12:16 -07:00 |
|
snipe
|
8c164d1b09
|
Merge pull request #16441 from snipe/added_modal_tests
Added modal tests
|
2025-03-06 15:06:08 +00:00 |
|