DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 17:44:17 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
11304 commits 96 branches 267 tags 295 MiB
Commit graph

11304 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M c3356ab765 fixed translation choice and color choice 2023-08-14 12:20:46 -07:00
Godfrey M 4446b2311d remove unnecessary changes 2023-08-14 12:14:15 -07:00
Godfrey M 6b94ef6adc fixes the statuslabeltypeforatter instead of the model 2023-08-14 12:13:01 -07:00
Godfrey M a0d5774635 adds translations to status label type column 2023-08-14 10:42:17 -07:00
snipe 291fa1cd29
Merge pull request #13445 from snipe/fixes/typo_in_formatter_for_asset_maintenances 
Fixed case in BS table formatter for boolean
 2023-08-14 13:02:27 +01:00
snipe 58286c9cab Fixed case in BS table formatter for boolean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-14 13:01:32 +01:00
Robert-Azelis 1e43d88e06
Create 2023_08_13_172600_add_email_to_companies.php 2023-08-13 17:25:33 +02:00
Robert-Azelis da701677c7
Update edit.blade.php 2023-08-13 17:24:17 +02:00
Robert-Azelis 30d33310ae
Update CompanyPresenter.php 2023-08-13 17:23:33 +02:00
Robert-Azelis bbb8ecfee4
Update Company.php 2023-08-13 17:21:55 +02:00
Robert-Azelis 8988a5dfc3
Update CompaniesTransformer.php 2023-08-13 17:20:15 +02:00
Robert-Azelis ed5b4ca0a2
Update CompaniesController.php 2023-08-13 17:18:25 +02:00
Robert-Azelis 07bafa9508
Update CompaniesController.php 2023-08-13 17:15:20 +02:00
snipe a1cfa45344
Merge pull request #13439 from snipe/fixes/500_error_when_cloning_invalid_accessory 
Fixed route for accessory index
 2023-08-11 09:42:00 +01:00
snipe df8f6a8d2b Correctly call the route for accessory index 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-11 09:40:49 +01:00
Marcus Moore 5b86c02366
Set permissions to empty object in user factory 2023-08-10 16:55:44 -07:00
Marcus Moore 41479b1ec7
Allow permissions in the user factory to be chained 2023-08-10 16:35:10 -07:00
Marcus Moore 3a2b15313c
Bump guzzlehttp/psr7 to 2.4.5 2023-08-10 11:53:20 -07:00
Marcus Moore 6b6bb61400
Bump nyholm/psr7 to 1.6.1 2023-08-10 11:52:42 -07:00
snipe 6adaa32286
Merge pull request #13431 from marcusmoore/feature/custom-report-scoping 
Removed unneeded `Company::scopeCompanyables` from `ReportsController`
 2023-08-10 09:57:53 +01:00
snipe a599f0c923
Merge pull request #13434 from marcusmoore/chore/improve-test-stability 
Improved test stability and messaging
 2023-08-10 09:57:26 +01:00
snipe 4db4bf7be4
Merge pull request #13432 from marcusmoore/chore/remove-old-testing-code 
Removed unused Codeception test code
 2023-08-10 09:57:11 +01:00
Marcus Moore 04661d5441
Add help text to response assertion helpers 2023-08-09 17:09:31 -07:00
Marcus Moore 3a5ed031bf
Escape values in response assertion helpers 2023-08-09 17:08:49 -07:00
Marcus Moore 60baaae192
Remove unused test bootstrap file 2023-08-09 16:22:58 -07:00
Marcus Moore 8508594a2f
Remove old and unused Codeception test code 2023-08-09 13:32:15 -07:00
Marcus Moore e0b464dcec
Merge branch 'develop' into feature/custom-report-scoping 2023-08-09 13:03:05 -07:00
snipe bd3ba9a5f7
Merge pull request #13428 from snipe/security/update_autotable 
Updated autotable
 2023-08-09 10:49:01 +01:00
snipe a65ac1ccdf Updated autotable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-09 10:47:45 +01:00
snipe ffabc9c331
Merge pull request #13414 from marcusmoore/fixes/chipperci-config 
Fixes ChipperCi Pipeline
 2023-08-09 10:37:21 +01:00
snipe a6a742d8d8
Merge pull request #13407 from marcusmoore/feature/sc-23465 
Added messaging to category edit page to improve clarity around when users will be emailed
 2023-08-09 10:36:19 +01:00
Marcus Moore 2e632a3d2d
Improve test readability 2023-08-08 17:40:02 -07:00
Marcus Moore c32f099053
Remove unneeded call to Company::scopeCompanyables 2023-08-08 17:22:15 -07:00
Marcus Moore c752e1670c
Add test around company scoping in custom report 2023-08-08 17:21:39 -07:00
Marcus Moore 1405e17251
Add simple test around custom asset report response 2023-08-08 17:10:36 -07:00
snipe 15122bbb55
Merge pull request #13425 from snipe/security/upgrade_webpack_snyk_13416 
Updated webpack
 2023-08-08 22:24:59 +01:00
snipe c18349d75f Updated webpack 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 22:07:49 +01:00
snipe 521961457d
Merge pull request #13424 from snipe/bug/sc-23552 
Fixed tooltip not loading on encrypted field lock icon on asset detail view
 2023-08-08 19:00:56 +01:00
snipe 6a3a38b6f6 Call tooltip again on custom fields jquery 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 18:53:57 +01:00
snipe 40aca9709a Added container to the tooltip invocation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 18:52:26 +01:00
snipe 9e6f23c8c7
Merge pull request #13421 from uberbrady/re_add_asset_eol_date 
Re-add the option for asset_eol_date as an import field
 2023-08-08 17:52:05 +01:00
Brady Wetherington 6afbf1b152 Re-add the option for asset_eol_date as an import field 2023-08-08 17:45:33 +01:00
snipe af91ffb2da
Merge pull request #13418 from snipe/fixes/add_mailgun_endpoint 
Added mailgun endpoint option, defaulting to the US
 2023-08-08 12:56:37 +01:00
snipe 94bef046b8 Added mailgun endpoint option, defaulting to the US 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 12:50:38 +01:00
snipe bd4061e023 Change text on dropdown 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 08:18:56 +01:00
snipe 5bda73f151 Ugh - messing with the blade layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 08:18:40 +01:00
Marcus Moore b56bcd3596
Troubleshooting pipeline: create both .env and .env.testing 2023-08-07 11:59:58 -07:00
Marcus Moore 999605b591
Troubleshooting pipeline: create .env.testing in place of .env 2023-08-07 11:57:34 -07:00
Marcus Moore d3a45f73cf
Troubleshooting pipeline: re-add creating .env.testing 2023-08-07 11:48:09 -07:00
Marcus Moore 0d40979724
Troubleshooting pipeline: Remove commented commands 2023-08-07 11:36:51 -07:00