Godfrey M
|
437b3cd865
|
fix conflicts
|
2025-03-04 13:08:53 -08:00 |
|
Godfrey M
|
3641016271
|
remove commented code
|
2025-03-04 13:08:03 -08:00 |
|
Godfrey Martinez
|
cc127c8e1e
|
Merge branch 'develop' into expiring-asset-email-test
|
2025-03-04 13:06:36 -08:00 |
|
Godfrey M
|
4bac509341
|
fix Expiring alert tests
|
2025-03-04 12:58:04 -08:00 |
|
snipe
|
f4f6dcb885
|
Updated test
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 20:48:59 +00:00 |
|
snipe
|
d89f38bbfb
|
Set defaults on save
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 20:38:33 +00:00 |
|
snipe
|
9351cc2252
|
Set default to 0
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 20:38:22 +00:00 |
|
snipe
|
a31a732d38
|
Nicer UI for invert flag
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 20:38:15 +00:00 |
|
snipe
|
1be420b0e9
|
Fixed test
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 20:37:45 +00:00 |
|
snipe
|
2b0127ab0c
|
Bumped version
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.4) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Update Docker Hub Description / dockerHubDescription (push) Has been cancelled
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 19:56:58 +00:00 |
|
snipe
|
8791640908
|
Add @Fiala06 as a contributor
|
2025-03-04 19:53:25 +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 |
|
snipe
|
45317c0959
|
Merge pull request #16415 from snipe/nicer_error_message_on_model_not_found
Nicer model name formatting on RMB model not found
|
2025-03-04 19:42:45 +00:00 |
|
snipe
|
63e4c42445
|
Added strtolower
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 19:33:17 +00:00 |
|
snipe
|
d4e227f003
|
Whitespace
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 19:29:09 +00:00 |
|
snipe
|
bbabbe1b87
|
Nicer model name formatting on RMB model not found
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 19:21:46 +00:00 |
|
snipe
|
16b97c18e0
|
Shim route for asset maintenances redirect on RMB not found
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 17:16:16 +00:00 |
|
snipe
|
fa72696a35
|
Removed redundent text
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 17:06:56 +00:00 |
|
snipe
|
9467ec2571
|
Nicer env text
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 17:05:45 +00:00 |
|
snipe
|
ac3f61c96a
|
Fixed extra escape character
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 17:00:44 +00:00 |
|
snipe
|
d2e0a23994
|
Merge pull request #16412 from snipe/#16150_fixed_regression_in_branding_page
Fixed regression from #16150
|
2025-03-04 15:55:24 +00:00 |
|
snipe
|
ccea55308b
|
Fixed regression from #16150
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 15:53:30 +00:00 |
|
snipe
|
acaa3a28e7
|
Merge pull request #16410 from snipe/#16407_component_checkout_and_notes_fix
Fixed #16407 - weird layout on components for non super user
|
2025-03-04 15:38:20 +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
|
e19003aea5
|
Merge pull request #16409 from snipe/#16386_user_dropdown_fields_not_populating_on_edit
Fixed #16386 - some fields not populating with user data on edit
|
2025-03-04 15:28:11 +00:00 |
|
snipe
|
a09a9d3cd6
|
Added item to payload
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 15:26:25 +00:00 |
|
snipe
|
759e3794df
|
Small upgrader UI fixes
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 14:57:28 +00:00 |
|
snipe
|
c50b14763f
|
Merge pull request #16403 from snipe/#16402_each_localization
Fixed #16402 - localize "each" string in components tab on asset view
|
2025-03-04 13:35:08 +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
|
83855d44d0
|
Merge pull request #16251 from Godmartinz/Audit_Checkin_warning_fix
refactors audit notification to mail, adds test, adds alerts check to scheduler
|
2025-03-04 12:51:42 +00:00 |
|
snipe
|
6f847294ed
|
Merge pull request #15911 from Fiala06/patch-1
Fixed duplicate entries preventing LDAP sync from continuing
|
2025-03-04 12:49:54 +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 |
|
snipe
|
3bb94e98f0
|
Merge pull request #16398 from marcusmoore/bug/sc-28535
Avoid using authenticated user's email address in email partial
|
2025-03-04 12:47:10 +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 |
|
snipe
|
7f36750e33
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2025-03-03 19:54:14 +00:00 |
|
snipe
|
de046db106
|
Add @azmcnutt as a contributor
|
2025-03-03 19:53:30 +00:00 |
|
snipe
|
eb1d27a5bc
|
Merge pull request #16379 from azmcnutt/feature/settings_ldap_invert_active_flag
Feature/settings ldap invert active flag
|
2025-03-03 19:52:57 +00:00 |
|
Godfrey M
|
cc0b9f404a
|
merged develop, fix conflicts
|
2025-02-27 15:38:31 -08:00 |
|
Marcus Moore
|
70332696c6
|
Fix test by passing in required properties
|
2025-02-27 15:23:17 -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
|
a9ed9e2a7f
|
Merge pull request #16378 from snipe/wrap_pdf_table_results
Wrap long text in PDF export in tables
|
2025-02-27 19:06:34 +00:00 |
|