ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,186 Commits 84 Branches 293 Tags
f6bf2d03c403f29f3ef31246ecba82b079cb96b0
Commit Graph

15186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
snipe f6bf2d03c4 Merge pull request #15445 from Godmartinz/eula_confusion 
Fixed priority for category eula vs default eula
 2024-09-10 11:04:58 +01:00
snipe 6f44441a8b Merge pull request #15469 from marcusmoore/accessory_tests 
Added UI tests for creating accessories
 2024-09-10 11:04:23 +01:00
snipe e7e5dfbdfa Merge pull request #15470 from marcusmoore/company_tests 
Added UI tests for creating companies
 2024-09-10 11:04:08 +01:00
snipe d62315fbe4 Merge pull request #15472 from marcusmoore/testing/dashboard_counts 
Added test for dashboard counts
 2024-09-10 11:03:55 +01:00
snipe 7f3f77dec8 Merge pull request #15473 from marcusmoore/testing/accessory_api_tests 
Added some permission tests for accessory api endpoints
 2024-09-10 11:03:46 +01:00
snipe 82e56c6832 Merge pull request #15474 from marcusmoore/bug/sc-26730 
Fixed login success message not being displayed
 2024-09-10 09:37:02 +01:00
Marcus Moore 76c9015aa9 Add test case 2024-09-09 16:51:40 -07:00
Marcus Moore 5d5f421294 Add test case 2024-09-09 16:49:43 -07:00
Marcus Moore dc6a5bf998 Reflash session so login message is displayed 2024-09-09 14:54:19 -07:00
Marcus Moore 0820dd9da4 Update test names 2024-09-09 14:36:32 -07:00
Marcus Moore aa6ab2df60 Add permission tests for some accessory api endpoints 2024-09-09 14:35:38 -07:00
Marcus Moore 22a2cc0256 Add test for dashboard counts 2024-09-09 13:21:10 -07:00
Marcus Moore 35533c39d5 Merge branch 'develop' into company_tests 2024-09-09 12:18:02 -07:00
Marcus Moore de403f6e07 Merge branch 'develop' into accessory_tests 2024-09-09 12:17:53 -07:00
snipe 549dec9f9e Merge pull request #15468 from marcusmoore/coverage 
Added coverage commands for Herd users
 2024-09-09 20:13:01 +01:00
Marcus Moore d4426e4686 Add simple tests for company creation via UI 2024-09-09 11:03:00 -07:00
snipe b2a6349243 Merge pull request #15465 from snipe/update_city_on_bulk_user_edit 
Correctly save user’s city on bulk edit
 2024-09-09 10:06:42 +01:00
snipe c5dbc5f6b8 Correctly save user’s city on bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-09 10:01:07 +01:00
snipe ce97e2a30f Merge pull request #15463 from snipe/consumables_order_by_remaining 
Added ability to sort on qty and remaining for consumables
 2024-09-09 03:54:28 +01:00
snipe 7d9a0eba04 Added ability to sort on qty and remaining for consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-09 03:49:58 +01:00
Marcus Moore 010f66f4c9 Add validation test 2024-09-04 15:48:11 -07:00
Marcus Moore 9c6718b459 Organize 2024-09-04 15:46:35 -07:00
Marcus Moore 9f832a93c9 Ensure user is stored 2024-09-04 15:44:52 -07:00
Marcus Moore 487d88c012 Add some ui tests for accessories 2024-09-04 15:43:01 -07:00
Marcus Moore 0e9f7153c0 Add composer commands for generating coverage reports via Herd 2024-09-04 15:13:45 -07:00
Godfrey M 7c8955b126 revert changes to label view 2024-09-04 12:38:35 -07:00
Godfrey M 20fa4c39f9 adds setEula to support\settings 2024-09-04 12:26:44 -07:00
Godfrey M f04a4a3cf5 adds test 2024-09-04 12:21:49 -07:00
Godfrey M cf07186ae8 gives priority to default eula being checked vs catregory eula 2024-09-03 12:23:23 -07:00
snipe e1fcfc8dc1 Merge pull request #15440 from snipe/fixes/user_api_put_patch 
Fixes  #15435 - user api put patch API route regression
 2024-09-02 19:14:49 +01:00
snipe 9fe8a866e0 Updated test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-02 19:07:21 +01:00
snipe e8e3060a75 Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-02 18:51:22 +01:00
snipe 6aaf2f623f Removed extra route 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-02 18:49:55 +01:00
snipe dfbccf50e8 Added patch/put back into resource routes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-02 18:48:09 +01:00
snipe 13dbf9ee74 Added icon for dept 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-31 13:48:42 +01:00
snipe f8bbb7ad9b Merge pull request #15431 from snipe/add_employee_num_to_asset_overview 
Added employee number to asset view
 2024-08-31 13:47:25 +01:00
snipe 3c7d455ee3 Added employee number to asset view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-31 13:38:38 +01:00
snipe 12fa505972 Disabmiguate licenses company_id 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 21:07:30 +01:00
snipe 4e4930ba62 Check for array 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 21:01:48 +01:00
snipe 76301bc30d Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 20:05:03 +01:00
snipe 964e105cf9 Merge pull request #15415 from snipe/rules/prevent_company_switch 
Validation rules to prevent switching user companies if items are assigned to them
 2024-08-29 19:20:03 +01:00
snipe 6fd24c7e14 Merge pull request #15418 from snipe/added_multiple_for_custom_report 
Fixed #15416 - Added multiple selects for custom report
 2024-08-29 18:55:11 +01:00
snipe 231bc1e2de Updated blade selectors 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 18:31:34 +01:00
snipe 37d04b7176 Some CSS tweaks for select2 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 17:52:01 +01:00
snipe e62a802926 Use whereIn instead of where = 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 17:51:44 +01:00
snipe 69e981364a Made multiple select 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 17:51:20 +01:00
snipe abb4221539 Validation rules to prevent switchng user companies if assets are assigned 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 14:55:18 +01:00
snipe e4ebabdaba Merge pull request #15414 from uberbrady/fix_create_user 
Use the null-safe property accessor for new-user creation
 2024-08-29 14:19:51 +01:00
Brady Wetherington da1e383295 Use the null-safe property accessor for new-user creation 2024-08-29 14:09:23 +01:00
snipe b64ed254e0 Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 13:49:09 +01:00