DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
17103 commits 59 branches 275 tags 321 MiB
Commit graph

17103 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
snipe 23ce54e80c Make sure we’re saving the last_login in 2FA auths 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-27 16:17:59 +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
snipe 1051b1d16d
Merge pull request #16375 from snipe/fixes_16371_name_not_included_in_reminder_emails 
Fixed #16371 - incorrect count and missing name in acceptance reminder email
 2025-02-27 15:00:04 +00:00
snipe 115bb94704
Merge pull request #16156 from marcusmoore/acceptance-reminder-subject 
Added "Reminder" to subject line of follow up asset checkout emails
 2025-02-27 14:55:59 +00:00
snipe 25807cc62f Fixed constructor 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-27 14:22:48 +00:00
snipe cd1d1b2d3e Fixed count 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-27 14:22:40 +00:00
Brady Wetherington 6dcd3bfd30 Add some safeties around the charset-detection and transliteration 2025-02-27 13:44:31 +00:00
snipe b8799f8038 Bumped bash 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-27 12:21:28 +00:00
Marcus Moore a0dc056da8
Replace Form::checkbox on label settings page 2025-02-26 16:33:07 -08:00
Marcus Moore 27aeb518ff
Replace Form::checkbox on general settings page 2025-02-26 16:18:00 -08:00
snipe dc619bb0dc
Merge pull request #16365 from marcusmoore/chore/migrate-checkbox-helpers-pt6 
Replace calls to Form::checkbox pt6
 2025-02-26 23:54:50 +00:00
Marcus Moore 245a16c377
Replace Form::checkbox on branding settings page 2025-02-26 15:37:07 -08:00
Marcus Moore de3c1d159f
Replace Form::checkbox on branding settings page 2025-02-26 15:35:17 -08:00
Marcus Moore af6d9e4a00
Replace Form::checkbox on custom report pages 2025-02-26 15:15:48 -08:00
snipe 8c8af3062e
Merge pull request #16354 from snipe/dont_checkin_for_pending_on_asset_update 
Allow pending as an asset status type that does not automatically check the asset in
 2025-02-26 21:05:11 +00:00
snipe 2ff47edb94
Merge pull request #16361 from Godmartinz/acceptancer_reminder_unlisted_email_info 
Fixed acceptance reminder command lag on users with no associated email
 2025-02-26 20:33:02 +00:00
snipe d923d29bad
Merge pull request #16360 from spencerrlongg/bug/sc-28537 
Add Safety Around Bulk Status Update
 2025-02-26 20:32:19 +00:00
Godfrey M 899119ae2d changes output to a table 2025-02-26 12:30:19 -08:00
snipe e031de8e49
Merge pull request #16363 from snipe/added_a_few_more_no_interaction_calls 
Added `--no-interaction` to additional passport commands
 2025-02-26 20:19:37 +00:00
snipe a81c520d93 Follow up for #16341 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-26 20:15:09 +00:00
Godfrey M 8352e81228 fix unaccepted reminder test 2025-02-26 11:50:08 -08:00
Godfrey M fd0174ff32 remove unwanted changes to livewire 2025-02-26 11:31:41 -08:00