DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 03:24:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12044 commits 96 branches 267 tags 296 MiB
Commit graph

12044 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe 0d37d1a905
Merge pull request #13279 from snipe/security/acorn-upgrade 
Upgraded acorn
 2023-07-10 20:08:46 +01:00
snipe 83cf106ce5 Upgraded acorn 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-10 20:06:57 +01:00
snipe 7debf126d6 Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-10 20:03:12 +01:00
snipe c5c87ea0ca
Merge pull request #13278 from snipe/security/bs-tables-update 
Applied Snyk #13272
 2023-07-10 20:01:41 +01:00
snipe 8169206943 Applied Snyk #13272 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-10 19:59:08 +01:00
snipe 22d9df304b
Merge pull request #13265 from marcusmoore/chore/chipperci-on-prs 
Have ChipperCi run on each PR
 2023-07-10 19:48:40 +01:00
snipe 14c61e4c17 Added phone, fax to departments, locations, companies 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-10 19:44:21 +01:00
Joël Pittet a4a676ef0b Update league/oauth2-server for CVE-2023-3726 and lcobucci/clock to semver to allow dependencies to update 2023-07-10 11:19:54 -07:00
Brady Wetherington 8f2a17585e Merge branch 'develop' into snipeit_v7 
Had to do a lot of conflict work here, so this could get ugly :(
 2023-07-10 16:53:35 +01:00
Ivan Nieto Vivanco 299e546021 Adds the Username and Email to License Importer dropdown 2023-07-06 18:36:13 -06:00
snipe 5a9c2925c3
Merge pull request #13264 from marcusmoore/bug/sc-23451 
Fix label wrapping on category edit page
 2023-07-06 19:01:36 +01:00
Marcus Moore 149184dc3c
Have ChipperCI on on each PR 
Following up on #13218
 2023-07-06 11:00:03 -07:00
Marcus Moore ef160b0e15
Add span tag so label is displayed properly 2023-07-06 10:49:57 -07:00
Ivan Nieto Vivanco f4ca29b4a8 Only show radio inputs for location in checkin view 2023-07-06 11:36:55 -06:00
Ivan Nieto Vivanco 9591442f1e Evaluate the radio input to update location only or default location too 2023-07-06 10:46:21 -06:00
Ivan Nieto Vivanco 743e852998 Add radio buttons to alter asset checkin location behavior 2023-07-06 10:38:48 -06:00