DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 15:44:11 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
7860 commits 97 branches 266 tags 291 MiB
Commit graph

7860 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 30583f920d
Merge pull request #11184 from uberbrady/fix_google_ldap_rebased 
Google client-side TLS auth works better with null as context(?)
 2022-05-23 20:35:15 -07:00
Brady Wetherington 5130a86854 Google client-side TLS auth works better with null as context(?) 2022-05-23 20:31:43 -07:00
snipe e34ea32a5e Fixed translation styring reference 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-23 20:15:22 -07:00
snipe 8333089278
Merge pull request #11172 from snipe/rebased_added_gitkeep_to_to_eula_pdfs 
Accept asset/accessory improvements and fixes
 2022-05-23 12:59:01 -07:00
snipe 70344cc02e
Merge pull request #11149 from Godmartinz/gh11129_setting_disclosure_arrow 
Fixed #11129 - settings treeview won't stay active.
 2022-05-23 12:55:11 -07:00
Godfrey M 4adb990a5d removed line breaks and deadspace 2022-05-23 09:37:20 -07:00
Godfrey M 160a147a58 removed line breaks and deadspace 2022-05-23 09:35:19 -07:00
snipe bd384d3f10 Small formatting fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe ad8143b0bd Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe f439970e7a Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 625f120813 Removed unused cases 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe a37a576ee5 FIxed translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 2bd0679a81 A few more tweaks to PDFs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe b7eb72fe49 Rough refactor of the acceptance controller 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe afb3843fad Added sig and filename to acceptedCheckout method 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 8e85d316c9 Removed stored_eula_file from API transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe ebd3c11129 Added singleton 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 75acb0f28a Added sig and eula pdf to checkout_acceptance 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe eb5f33e815 Removed logging statement 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 8c64e7359a Added signature column, removed stored_eula_file column 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 14495cd1da Nicer PDF display 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 93eba43b76 Removed trailing slash from route 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe adbac82c30 Removed stored_eula_file from actionlog 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe e467ce912b Added some debugging and comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 4eab5fd075 Removed older comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe d0e8a4ca09 Added some comments for clarity 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe bcd0671213 Migration to drop stored_eula_column 
It’s extraneous, since we already have a file field in the action_logs, and we already store the stored_eula_file in checkout_acceptances.

Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 266a9e5328 Removed stored_eula_file from controller 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe a37fbe6abf
Merge pull request #11171 from inietov/fixes/checkout_date_missing_in_mail_when_importing_assets 
Fixes Checkout date missing in asset delivery mail
 2022-05-19 15:49:43 -07:00
Ivan Nieto Vivanco 52901f50eb Add date to checkout action when importing assets 2022-05-19 17:38:10 -05:00
snipe 8706b6d8a9
Merge pull request #11167 from inietov/fixes/error_500_on_import_page 
Fixes #9019 Import page returns error 500
 2022-05-19 10:50:59 -07:00
Ivan Nieto Vivanco 5d29f77d60 Initialize result variable so return don't crash 2022-05-19 12:47:12 -05:00
snipe deda1c2fd6
Merge pull request #11161 from snipe/fixes/corrects_retagging_script 
Small fixes for asset tag regeneration script
 2022-05-18 17:19:40 -07:00
snipe 4669bb54fe Small fixes for asset tag regeneration script 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 17:14:22 -07:00
snipe 319eae7810 Recompiled dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 16:21:04 -07:00
snipe 8449b5ca1e
Merge pull request #11160 from uberbrady/improve_default_custom_field_value_on_asset_create 
Fixed: #11098 - Smartly overwrite fields with default values for custom fields
 2022-05-18 16:12:12 -07:00
Brady Wetherington e4b24e17f3 Improve comments because the logic is complicated and unintuitive 2022-05-18 16:06:39 -07:00
Brady Wetherington 981741062b Try to intelligently overwrite fields with default values for custom field 2022-05-18 15:51:32 -07:00
snipe a55adfc0a1
Merge pull request #11152 from Godmartinz/link_inconsistentcies 
Thanks!
 2022-05-18 15:45:30 -07:00
snipe f609146c29 Corrected field name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 15:37:10 -07:00
snipe 891009dc67 Nicer formatting for buttons in bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 15:35:57 -07:00
Godfrey M ab23e04c65 re-adds Request::is to setting categories 2022-05-18 14:33:41 -07:00
Godfrey M 877b1bd0a3 re-adds Request::is to setting categories 2022-05-18 14:31:03 -07:00
snipe bef895eaf4
Merge pull request #11158 from snipe/fixes/perform_db_migrate_on_restore 
Run migrations after restore
 2022-05-18 14:17:21 -07:00
snipe 014a32b050 Run migrations after restore 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 14:12:17 -07:00
snipe f14a4d3bc7 Recompiled dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 13:35:38 -07:00
snipe 9e9d371e1c
Merge pull request #11157 from uberbrady/fix_select2_autofocus 
Downgrade jQuery to 3.5.1 from 3.6.0 to re-enable select2 autofocus
 2022-05-18 13:34:22 -07:00
Brady Wetherington 9e2bcfe168 Downgrade jQuery to 3.5.1 from 3.6.0 to re-enable select2 autofocus 2022-05-18 13:24:02 -07:00
Godfrey M eaeb74c576 readded comment 2022-05-18 13:13:38 -07:00
Godfrey M 23891054dc removed dead space and unused namespace 2022-05-18 13:11:20 -07:00