Commit graph

5507 commits

Author SHA1 Message Date
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
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
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
snipe
f42fcd25b1 Make the assets tab active by default on locations page
Signed-off-by: snipe <snipe@snipe.net>
2025-03-06 12:05:36 +00:00
Marcus Moore
3db124e709
First pass at updating wording for asset checkout mail 2025-03-05 18:12:23 -08:00
Marcus Moore
70de08a211
Replace hard-coded link to report template 2025-03-05 16:26:26 -08:00
snipe
0e1f40626f Updated label colors in blue skin
Signed-off-by: snipe <snipe@snipe.net>
2025-03-05 13:40:36 +00:00
snipe
fcf7a543fd Check if $item is set
Signed-off-by: snipe <snipe@snipe.net>
2025-03-05 10:47:33 +00:00
Spencer Long
6201e475cb
Merge branch 'develop' into feature/sc-24347 2025-03-04 21:20:46 -06:00
snipe
bef54983fa
Merge pull request #16421 from marcusmoore/chore/migrate-label-helpers-pt8
Replace calls to Form::label pt8
2025-03-05 01:01:21 +00:00
Marcus Moore
f2b44f7002
Replace Form::label in company select partial 2025-03-04 16:46:43 -08:00
Marcus Moore
de7d32f632
Replace Form::label on ldap settings page 2025-03-04 16:44:26 -08:00
Marcus Moore
c798df2920
Replace Form::label on label settings page 2025-03-04 16:34:22 -08:00
snipe
779330af14
Merge pull request #16420 from marcusmoore/fixes/report-url
Fixed custom report template route
2025-03-05 00:11:30 +00:00
Marcus Moore
f01ff1f1d7
Add dedicated named route 2025-03-04 16:07:35 -08:00
Marcus Moore
1e4daf0348
Fix route 2025-03-04 16:04:28 -08:00
Godfrey M
49ff47fbcf Merge branch 'develop' into visited_link-color-change 2025-03-04 14:47:48 -08:00
snipe
a31a732d38 Nicer UI for invert flag
Signed-off-by: snipe <snipe@snipe.net>
2025-03-04 20:38:15 +00:00
snipe
1dacd25e6d Check for purchase_cost before adding the “each”
Signed-off-by: snipe <snipe@snipe.net>
2025-03-04 19:50:11 +00:00
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
Godfrey M
5eebdcddb2 changes visited and link colors 2025-03-04 10:12:45 -08:00
snipe
ccea55308b Fixed regression from #16150
Signed-off-by: snipe <snipe@snipe.net>
2025-03-04 15:53:30 +00:00
snipe
c4722898b7 Fixed #16407 - weird layout on components for non super user
Signed-off-by: snipe <snipe@snipe.net>
2025-03-04 15:37:25 +00:00
snipe
369a68fe57 Fixed #16402 - Localize “each” in string
Signed-off-by: snipe <snipe@snipe.net>
2025-03-04 13:33:04 +00:00
snipe
d556d1c6e7
Merge pull request #16150 from Godmartinz/add-translations-to-settings
Adds Translation strings to General and Branding Settings
2025-03-04 12:48:21 +00:00
Marcus Moore
8f5f6f3502
Avoid using authenticated user's email address in email partial 2025-03-03 16:28:08 -08:00
snipe
b3792bfa00
Merge pull request #16396 from marcusmoore/chore/migrate-checkbox-helpers-pt10
Replace calls to Form::checkbox pt10
2025-03-03 20:52:54 +00:00
Marcus Moore
40f7257723
Replace call to Form::checkbox 2025-03-03 12:44:50 -08:00
snipe
8486256142
Merge pull request #16381 from marcusmoore/chore/migrate-checkbox-helpers-pt9
Replace calls to Form::checkbox pt9
2025-03-03 20:28:21 +00:00
Godfrey M
cc0b9f404a merged develop, fix conflicts 2025-02-27 15:38:31 -08:00
Marcus Moore
7a9b5d61b0
Replace another Form::checkbox 2025-02-27 13:25:32 -08:00
Marcus Moore
5876259893
Replace another Form::checkbox 2025-02-27 13:19:26 -08:00
Marcus Moore
8755c54edc
Replace Form::checkbox 2025-02-27 13:13:39 -08:00
Marcus Moore
014f3b7652
Cast to boolean 2025-02-27 13:12:01 -08:00
Marcus Moore
3a2579b205
WIP: replace Form::checkbox 2025-02-27 13:08:02 -08:00
James M
149474bfe3
Update general.php
FIX: Spelling error
2025-02-27 12:42:47 -07:00
James M
b2b768dede
Merge branch 'snipe:develop' into develop 2025-02-27 12:25:07 -07:00
snipe
ce8523b00a Fixed wrapping
Signed-off-by: snipe <snipe@snipe.net>
2025-02-27 18:58:18 +00:00
snipe
7076a68d35 Wrap table results in PDF
Signed-off-by: snipe <snipe@snipe.net>
2025-02-27 18:38:10 +00:00
James M
112112d258 Feat: #14926 LDAP Active Flag - Add config option to make False = Enable 2025-02-27 10:52:12 -07:00
snipe
3928c8afe9
Merge pull request #16376 from uberbrady/improve_safety_csv_charset_detection
Add some safeties around the charset-detection and transliteration
2025-02-27 16:26:44 +00:00
Brady Wetherington
646e3e8df5 Complete failed-transliteration test, clean up error, new translation string 2025-02-27 16:10:56 +00:00
snipe
30c4e9dbf7 Use formatter for created_at on unaccepted assets
Signed-off-by: snipe <snipe@snipe.net>
2025-02-27 15:48:24 +00:00
snipe
27fc30a881 Nicer button layout on unaccepted assets
Signed-off-by: snipe <snipe@snipe.net>
2025-02-27 15:43:53 +00:00
snipe
8ac7cda4ee
Merge pull request #16366 from marcusmoore/chore/migrate-checkbox-helpers-pt7
Replace calls to Form::checkbox pt7
2025-02-27 15:01:31 +00:00
snipe
6f04d314a8
Merge pull request #16367 from marcusmoore/chore/migrate-checkbox-helpers-pt8
Replace calls to Form::checkbox pt8
2025-02-27 15:01:19 +00:00