DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 06:59:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11438 commits 101 branches 268 tags 288 MiB
Commit graph

11438 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 18e2ec4dad
Merge pull request #13310 from marcusmoore/bug/sc-23478 
Fixed the inability to load location select when editing profile
 2023-07-18 13:26:30 +01:00
snipe 6f8c3ca167
Merge pull request #13322 from uberbrady/fix_ldap_location_3 
Fix to ldap_location attribute
 2023-07-18 13:24:59 +01:00
snipe cbdce994b8
Merge pull request #13318 from inietov/fixes/employee_id_not_importing 
Fixed Employee Number no longer importing [sc-23497]
 2023-07-18 11:08:43 +01:00
Brady Wetherington 051830dff4 Fix to ldap_location attribute 2023-07-17 20:42:02 +01:00
Marcus Moore 2eaab6d9fb
Change message to a callout 2023-07-17 12:23:31 -07:00
Marcus Moore fa0a88289a
Add tests around user search 
Follow up to #13311
 2023-07-17 11:29:22 -07:00
Ivan Nieto Vivanco 88c40c9c14 Change the field name to the same the model uses 2023-07-17 12:08:10 -06:00
snipe f15e14f905
Merge pull request #13315 from snipe/features/add_warranty_link_even_if_no_warranty_set 
Moved warranty into manufactuer’s section
 2023-07-15 10:47:44 +01:00
snipe c21a7db3c1 Moved warranty into manufactuer’s section 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-15 10:45:36 +01:00
snipe bb0eaf8b8d
Merge pull request #13312 from snipe/features/add_show_hide_option_on_custom_fields 
Added ability to show/hide custom fields in list views by default
 2023-07-14 09:38:35 +01:00
snipe 3078cab7ee Added ability to show/hide custom fields in list views by default 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-14 09:09:43 +01:00
snipe 15bb943210
Merge pull request #13311 from snipe/fixes/deleted_users_showing_in_current_users 
Fixed: deleted users showing in current users
 2023-07-14 07:47:36 +01:00
snipe f51dd15893 Moved deleted scope down 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-14 07:44:19 +01:00
Marcus Moore 346ace9444
Allow users that have permission to edit their own location to see locations in select list 2023-07-13 17:37:46 -07:00
Ivan Nieto Vivanco ecac4718fe Add date casting to the SQL query, so the BETWEEN range doesn't care about time of day in custom report datetimes 2023-07-13 16:02:47 -06:00
snipe 4027acee46
Merge pull request #13184 from akemidx/department_in_side_bar 
User department now visible in side pane of asset view page
 2023-07-13 21:01:48 +01:00
snipe 5aa99a15d8
Merge pull request #13288 from snipe/fixes/line_based_markdown 
Added Inline markdown method
 2023-07-13 13:16:50 +01:00
snipe 016502f637 Added notesFormatter 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-13 13:14:10 +01:00
snipe 5d1f294f0e Added parseEscapedMarkedownInline to accessories API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-13 12:03:01 +01:00
snipe 981c3a430d
Merge pull request #13301 from uberbrady/better_auto_increment_tags 
Better auto increment asset-tags [FD-32892]
 2023-07-13 09:49:44 +01:00
Joël Pittet 24adcdb586 Revert lock file changes for PHP 7 support 2023-07-12 17:58:52 -07:00
akemidx 1163af3c10 change to make sure department actually exists 2023-07-12 15:57:44 -04:00
snipe 232e84acf7
Merge pull request #13302 from snipe/features/env_setting_for_bs_tables 
Fixed #13256 - Added option to switch to localStorage instead of cookies
 2023-07-12 20:10:33 +01:00
snipe 5d60a38a0e Added comment with link 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-12 20:08:20 +01:00
snipe c1c2c38995 Fixed #13256 - Added option to switch to localStorage instead of cookies 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-12 20:06:17 +01:00
snipe 44231fa52c
Merge pull request #13225 from inietov/fixes/change_default_location_at_checkin 
Fixed #13167 Default location not being set/updated upon check-in
 2023-07-12 19:14:53 +01:00
snipe 44b8558e38
Merge pull request #13233 from Godmartinz/barcode_adjusts_if_qr_code_ 
fixed margin if qr_code present
 2023-07-12 17:11:58 +01:00
snipe d3c44a462e
Merge pull request #13268 from inietov/fixes/license_importer_missing_dropdown_items 
Fixed License importer missing Checkout to: Username and Checkout to: Email in dropdown [sc-23456]
 2023-07-12 17:11:27 +01:00
snipe a569a99e61 Used inline markdown in views 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-12 16:57:04 +01:00
Brady Wetherington e648da9dc5 Also do a sanity-check that the normal asset autoincrementing works 2023-07-12 16:51:23 +01:00
Brady Wetherington 76191a09ed Improvements to asset_tag auto-incrementing, with auto-fixups for gaps 2023-07-12 16:39:45 +01:00
snipe 1b8b117f4e
Merge pull request #13292 from marcusmoore/guard-against-wiping-local-db 
Avoid accidentally wiping local database when running tests
 2023-07-12 15:23:11 +01:00
Marcus Moore 3df175fb3e
Improve variable name 2023-07-11 16:36:38 -07:00
Marcus Moore 44d8b2fd5e
Handle default eula checkbox 2023-07-11 16:36:03 -07:00
Ivan Nieto Vivanco e0df8cc4aa Add admin role to show encrypted customfield values 2023-07-11 17:21:32 -06:00
Marcus Moore af681d8190
Display message and update checkbox depending on EULA status 2023-07-11 16:12:43 -07:00
snipe 2bc4235368
Merge pull request #13293 from marcusmoore/run-chipper-on-all-prs 
Run ChipperCI on all PRs (take three)
 2023-07-11 20:36:49 +01:00
Marcus Moore 5b33c00e9f
Run ChipperCI on all PRs 2023-07-11 12:34:39 -07:00
Marcus Moore 48e4ec8cf5
Guard against wiping database when running tests and test specific envs are not created 2023-07-11 12:16:37 -07:00
snipe b5695c9ab7 Test parsedown in notes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-11 12:20:47 +01:00
snipe 6d3bf1e5f5 Added additional method for inline 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-11 11:41:58 +01:00
snipe 9b5a67e31f Use $Parsedown->line instead of $Parsedown->text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-11 11:33:29 +01:00
snipe ba37a9db8c
Merge pull request #13277 from snipe/features/added_phone_fax_to_locations 
Added phone, fax to departments, locations, companies
 2023-07-11 11:15:13 +01:00
snipe 9dc7fc93fb Small fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-11 11:14:19 +01:00
snipe a5555a1c67
Merge pull request #13281 from inietov/fixes/error_showing_requested_assets 
Fixed #13276 Error Showing Requested Assets
 2023-07-11 11:11:33 +01:00
snipe d76f420f4e
Merge pull request #13282 from marcusmoore/fixes/allow-installing-on-74-v2 
Fixes dev dependency on PHP 7.4
 2023-07-11 11:10:52 +01:00
Marcus Moore d8f22880d6
Allow installing on PHP 7.4 2023-07-10 17:35:21 -07:00
Ivan Nieto Vivanco ec8cb1b09e Add the withTrashed() method to requestingUser() method in CheckoutRequest model, so the view of requestable assets doesn't crash 2023-07-10 16:34:00 -06:00
snipe 4845a88c68
Merge pull request #13280 from snipe/security/webpack-upgade 
[Snyk] Upgrade webpack from 5.86.0 to 5.87.0 #13267
 2023-07-10 20:17:44 +01:00
snipe 73c2202d94 [Snyk] Upgrade webpack from 5.86.0 to 5.87.0 #13267 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-10 20:16:09 +01:00