Marcus Moore
|
2a156776a4
|
Merge branch 'develop' into chore/migrate-select-helper
# Conflicts:
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
|
2025-03-04 11:19:38 -08:00 |
|
snipe
|
369a68fe57
|
Fixed #16402 - Localize “each” in string
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 13:33:04 +00:00 |
|
Marcus Moore
|
4d55a67628
|
Merge branch 'develop' into chore/migrate-checkbox-helpers-p2
|
2025-02-24 16:37:59 -08:00 |
|
snipe
|
5fa4f85c20
|
Merge pull request #16106 from marcusmoore/bug/sc-27960
Fixed asset show page erroring when asset not associated with model
|
2025-02-24 17:16:12 +00:00 |
|
snipe
|
2bf4ec0ae8
|
A few more small tweaks
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-24 14:24:15 +00:00 |
|
snipe
|
42eda089e2
|
Added include for custom fields partial
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-22 18:11:27 +00:00 |
|
snipe
|
0cd0abe8bb
|
Fixed #16282 - adds accessories tab to assets
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-22 14:20:21 +00:00 |
|
Marcus Moore
|
ae7d7f7d22
|
Merge branch 'develop' into bug/sc-28148
# Conflicts:
# routes/web.php
|
2025-02-20 13:23:55 -08:00 |
|
snipe
|
75db0d9e66
|
Fixed parameter for audit
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-20 15:00:57 +00:00 |
|
snipe
|
3954ff20b4
|
More tweaks to the controllers, more breadcrumbs
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-19 03:29:31 +00:00 |
|
snipe
|
972bd1ef83
|
Tinkering with routes for breadcrumbs
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-19 00:37:09 +00:00 |
|
Marcus Moore
|
c165e6f400
|
Formatting
|
2025-02-18 15:20:22 -08:00 |
|
Marcus Moore
|
25215fd3c9
|
WIP: begin migrating notes to ui controller
|
2025-02-18 15:20:06 -08:00 |
|
snipe
|
c9de9ebbab
|
Merge pull request #16243 from marcusmoore/chore/migrate-form-open-pt3
Replace Form::open and Form::close pt3
|
2025-02-18 20:41:56 +00:00 |
|
Marcus Moore
|
93a67847ba
|
Migrate Form::open and Form::close on asset view
|
2025-02-12 11:38:19 -08:00 |
|
Marcus Moore
|
c569a84f87
|
Migrate Form::open and Form::close on requested assets page
|
2025-02-12 10:52:32 -08:00 |
|
Marcus Moore
|
c4b8b85602
|
Migrate Form::open and Form::close on bulk audit page
|
2025-02-11 15:42:20 -08:00 |
|
Marcus Moore
|
464e4d11e9
|
Migrate Form::open and Form::close on quick scan checkin page
|
2025-02-11 14:24:38 -08:00 |
|
Marcus Moore
|
85e4a19f03
|
Migrate Form::open on asset audit page
|
2025-02-11 14:22:17 -08:00 |
|
Marcus Moore
|
00e7795414
|
Merge branch 'develop' into chore/migrate-select-helper
# Conflicts:
# resources/views/partials/forms/edit/company.blade.php
|
2025-02-10 15:44:02 -08:00 |
|
Marcus Moore
|
b937b7e767
|
Migrate Form::checkboxes on asset history import page
|
2025-02-06 17:01:09 -08:00 |
|
Marcus Moore
|
38df5e8b07
|
Replace more Form::checkboxes
|
2025-02-06 15:52:23 -08:00 |
|
snipe
|
a722eca6aa
|
Merge pull request #16179 from marcusmoore/chore/migrate-form-radio-helpers-bulk-hardware
Replaced calls to Form::radio helper on bulk hardware edit page
|
2025-02-06 10:18:16 +00:00 |
|
Marcus Moore
|
478a5c0e1a
|
Migrate labels on bulk audit pag
|
2025-02-05 12:12:43 -08:00 |
|
Marcus Moore
|
5c6757ecf6
|
Migrate labels on quick checkin page
|
2025-02-05 12:07:17 -08:00 |
|
Marcus Moore
|
fbe19738cb
|
Swap Form::radio in bulk hardware edit view
|
2025-02-04 15:49:46 -08:00 |
|
Marcus Moore
|
6a35fa7ba3
|
Account for missing asset model
|
2025-01-21 10:14:27 -08:00 |
|
Marcus Moore
|
370666b5bd
|
Fix indenting
|
2025-01-21 10:12:56 -08:00 |
|
snipe
|
de5d66f5d2
|
Comment out ad-hoc note button for now
Signed-off-by: snipe <snipe@snipe.net>
|
2025-01-16 19:05:52 +00:00 |
|
snipe
|
0bb2e98af3
|
Built assets
Signed-off-by: snipe <snipe@snipe.net>
|
2025-01-14 12:33:59 +00:00 |
|
snipe
|
1c8d94c953
|
Merge pull request #15525 from akemidx/updated_ad_hoc_notes
|
2025-01-14 11:33:21 +00:00 |
|
Marcus Moore
|
2206b0a699
|
Convert additional Form::select to blade component
|
2025-01-13 12:50:18 -08:00 |
|
Marcus Moore
|
d74454620a
|
Convert Form::select to blade component
|
2025-01-13 12:45:49 -08:00 |
|
snipe
|
edacc4eb54
|
Merge pull request #15446 from Godmartinz/barcode_settings_hide
Refactored Barcode Settings into Label Settings
|
2024-12-16 16:09:34 +00:00 |
|
Godfrey M
|
833af55806
|
Merge branch 'develop' into barcode_settings_hide
|
2024-12-12 12:05:29 -08:00 |
|
snipe
|
c5e2aed164
|
Check for assigned (not assigned_to) before trying to present() the name on bulk delete assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-12 17:37:08 +00:00 |
|
snipe
|
82108f8a18
|
Merge pull request #15208 from akemidx/feature/sc-26415
FEATURE: Option for Notes to be Required on Asset Checkin/Checkout
|
2024-11-26 20:11:04 +00:00 |
|
akemidx
|
dd223fc215
|
commit for testing
|
2024-11-21 19:01:27 -05:00 |
|
snipe
|
8f7223128f
|
Merge pull request #15757 from akemidx/bug/sc-26944
FIXED: Bulk Delete page not showing full information
|
2024-11-19 12:34:57 +00:00 |
|
snipe
|
636e466b8a
|
Fixed delete model file route
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-14 17:58:20 +00:00 |
|
snipe
|
838a6d03bd
|
Corrected route name for filestable on assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-14 17:51:49 +00:00 |
|
akemidx
|
efeef5cdc4
|
removing || parts of if else
|
2024-11-13 18:29:58 -05:00 |
|
akemidx
|
9cb411c500
|
removing required form div container
|
2024-11-13 18:06:04 -05:00 |
|
snipe
|
47b2cdb846
|
Allow user to specify null for calculation or explicit on bulk edit
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-10 18:04:13 +00:00 |
|
snipe
|
6928b1b273
|
Added eol date to bulk asset edit
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-10 17:47:10 +00:00 |
|
akemidx
|
82c38a8b18
|
or statement for if/else
|
2024-11-04 20:43:18 -05:00 |
|
akemidx
|
2f5e468b3c
|
this fixes the assigned to piece
|
2024-11-04 19:48:34 -05:00 |
|
akemidx
|
f10807661d
|
fixing bulk delete table
|
2024-10-30 19:26:52 -04:00 |
|
snipe
|
37f14fff3b
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-22 22:07:28 +01:00 |
|
snipe
|
eb6c51fabd
|
Fixes #15701 - load avif files properly in lightbox
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-22 22:04:57 +01:00 |
|