Commit Graph
29 Commits
Author SHA1 Message Date
Max Lesechko f05137902e MC-34039: Merge 2.4-develop into 2.4-develop-php74 2020-05-06 16:44:48 -05:00
Lukasz Bajsarowicz 50e8aa63a4 #27500 PHPUnit9 for Downloadable module 2020-04-22 22:31:55 +00:00
Lukasz Bajsarowicz 83c23a5f80 #27500 Prepare Downloadable module Tests for PHPUnit 8 2020-04-11 13:30:11 +00:00
Myroslav Dobra b320ba6464 MC-13886: Downloadable Product controller|API save changes 2019-05-30 10:57:28 +03:00
Serhii Voloshkov 01a7ea0f8f MC-13886: Downloadable Product controller|API save changes 2019-05-02 11:59:44 +03:00
Dmytro Vilchynskyi c74256b9c6 MAGETWO-84702: [SE Dev] Error Messages edits, part 1 (966 of 1166 total)
- several messages are updated
2018-01-22 18:43:53 +02:00
Robert He b0e60f77e9 MAGETWO-69137: upgrading Magento2 Project PHPUnit version to latest 2017-07-13 11:21:33 -05:00
James Halsall a31f4a35c0 Remove the copyright year from file headers 2017-02-22 09:09:36 +00:00
Sergii Kovalenko eb30343a09 MAGETWO-62855: Copyright Year Update 2017 2017-01-05 13:01:45 +02:00
Stanislav Idolov e5df4bce47 MAGETWO-51858: Convert literal class names to \Namespace\Classname::class 2016-04-29 12:27:32 +03:00
Vladyslav Shcherbyna 1a0c93cc77 MAGETWO-46832: Downloadable webAPI tests tries to acces associative array via ID when keys have only natural identifiers 2016-04-15 15:33:54 +03:00
Vladyslav Shcherbyna d32b4e48f4 MAGETWO-46832: Downloadable webAPI tests tries to acces associative array via ID when keys have only natural identifiers - restore and fix 2016-04-15 13:54:14 +03:00
Anton Kaplya ffa49618f3 Merge branch 'develop' into MAGETWO-50676
Conflicts:
	app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
	app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php
	app/code/Magento/Bundle/Model/OptionRepository.php
	app/code/Magento/Bundle/Model/ResourceModel/Option.php
	app/code/Magento/Catalog/Model/CategoryRepository.php
	app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
	app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
	app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
	app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
	app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
	app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
	app/code/Magento/Catalog/Model/ProductLink/Repository.php
	app/code/Magento/Catalog/Model/ResourceModel/Attribute.php
	app/code/Magento/Catalog/Model/ResourceModel/Category.php
	app/code/Magento/Catalog/Model/ResourceModel/Product.php
	app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/AbstractIndexer.php
	app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
	app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
	app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
	app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
	app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
	app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Collection.php
	app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
	app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
	app/code/Magento/ConfigurableProduct/Model/Attribute/LockValidator.php
	app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
	app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
	app/code/Magento/Downloadable/Model/LinkRepository.php
	app/code/Magento/Downloadable/Model/Product/TypeHandler/AbstractTypeHandler.php
	app/code/Magento/Downloadable/Model/Product/TypeHandler/Link.php
	app/code/Magento/Downloadable/Model/Product/TypeHandler/Sample.php
	app/code/Magento/Downloadable/Model/ResourceModel/Link.php
	app/code/Magento/Downloadable/Model/SampleRepository.php
	app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Link.php
	app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollection.php
	app/code/Magento/Security/view/adminhtml/layout/default.xml
	app/code/Magento/Weee/view/adminhtml/layout/catalog_product_form.xml
2016-03-31 17:19:18 +03:00
Anton Kaplya d57c81ced2 MAGETWO-50676: EntityManager introduction 2016-03-22 22:15:24 +02:00
Anton Kaplya 60c448a5c7 Merge branch 'MAGETWO-49154-updated' into MAGETWO-50676
Conflicts:
	app/code/Magento/Security/view/adminhtml/layout/admin_login.xml
	app/code/Magento/Security/view/adminhtml/layout/default.xml
	app/code/Magento/Security/view/adminhtml/layout/security_session_activity.xml
	app/code/Magento/Security/view/adminhtml/page_layout/admin-popup.xml
	lib/internal/Magento/Framework/Model/Entity/Action/CreateExtension.php
	lib/internal/Magento/Framework/Model/Entity/Action/CreateMain.php
	lib/internal/Magento/Framework/Model/Entity/Action/CreateRelation.php
	lib/internal/Magento/Framework/Model/Entity/Action/DeleteExtension.php
	lib/internal/Magento/Framework/Model/Entity/Action/DeleteMain.php
	lib/internal/Magento/Framework/Model/Entity/Action/DeleteRelation.php
	lib/internal/Magento/Framework/Model/Entity/Action/ReadExtension.php
	lib/internal/Magento/Framework/Model/Entity/Action/ReadMain.php
	lib/internal/Magento/Framework/Model/Entity/Action/ReadRelation.php
	lib/internal/Magento/Framework/Model/Entity/Action/UpdateExtension.php
	lib/internal/Magento/Framework/Model/Entity/Action/UpdateMain.php
	lib/internal/Magento/Framework/Model/Entity/Action/UpdateRelation.php
	lib/internal/Magento/Framework/Model/Entity/MetadataPool.php
	lib/internal/Magento/Framework/Model/Operation/ContextHandlerInterface.php
	lib/internal/Magento/Framework/Model/Operation/Read.php
	lib/internal/Magento/Framework/Model/Operation/Write/Create.php
	lib/internal/Magento/Framework/Model/Operation/Write/Delete.php
	lib/internal/Magento/Framework/Model/Operation/Write/Update.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/CreateExtensionTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/CreateMainTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/CreateRelationTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/DeleteExtensionTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/DeleteMainTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/DeleteRelationTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/ReadExtensionTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/ReadMainTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/ReadRelationTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/UpdateExtensionTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/UpdateMainTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/UpdateRelationTest.php
2016-03-22 14:48:17 +02:00
Ievgen Sentiabov 7eda3e3eae Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-49721 2016-03-21 14:12:21 +02:00
Anton Kaplya 45f154e22f MAGETWO-50676: EntityManager introduction 2016-03-20 13:40:14 +02:00
Joan He 2d368d0134 MAGETWO-48081: Copyright Year Update 2016-03-17 15:49:11 -05:00
Ievgen Sentiabov 42dfc6f90e MAGETWO-49721: Revert backward incompatible changes related to product modules
- Fixed failed static tests
2016-03-17 10:50:08 +02:00
Ievgen Sentiabov fd7001ae23 MAGETWO-49721: Revert backward incompatible changes related to product modules
- Revert constructor changes for AdvancedPricingImportExport module
 - Revert constructor changes for Bundle module
 - Revert constructor changes for Link Product resource model
 - Revert constructor changes for ConfigurableProduct module
 - Revert constructor changes for Downloadable module
 - Revert constructor changes for GroupedProduct module
2016-03-17 10:17:52 +02:00
Nadiya Syvokonenko 558b4a8f28 MAGETWO-46472: Prepare pull request 2015-12-08 16:42:03 +02:00
Nadiya Syvokonenko be21026ec1 MAGETWO-46472: Prepare pull request
- phpcs_report.xml
2015-12-08 13:20:54 +02:00
Michael Logvin 0f0063045b MAGETWO-46472: Prepare pull request 2015-12-07 16:19:15 +02:00
Andrii Kasian 077db115c6 Merge remote-tracking branch 'mainline/develop' into MAGETWO-32622 2015-05-13 15:11:10 +03:00
Andrii Kasian 275e786d45 MAGETWO-32622: Define Public API
- MAGETWO-37129:  [TD] Samples and Links is mixed in API
2015-05-12 18:11:54 +03:00
Yu Tang 68b2a24c07 MAGETWO-28253: Downloadable Integration API
- Fix build failures
2015-04-20 08:42:25 -05:00
Yu Tang 4fc236a174 MAGETWO-28253: Downloadable Integration API
- Fix static build errors
2015-04-19 20:29:04 -05:00
Yu Tang 7fc830585e MAGETWO-28253: Downloadable Integration API 2015-04-19 11:32:04 -05:00
Christopher O'Toole 57aaeef6ae MAGETWO-34323: Move Magento/Downloadable module unit tests 2015-03-04 21:47:24 -06:00