bdnugget/magento2
1
0 Fork 0
mirror of https://github.com/bdnugget/magento2.git synced 2026-11-08 01:37:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
143,425 Commits 1 Branch 0 Tags
2.4-develop
Commit Graph
57 Commits
Author SHA1 Message Date
Sergii Kovalenko 083678cfc6 MAGETWO-87551: Convert existing data install/upgrade scripts 
--fix L1
 2018-02-14 00:22:05 +02:00
Stanislav Idolov 008379ba60 Merge remote-tracking branch 'mainline/develop' into MAGETWO-83893 2017-12-07 09:16:47 +02:00
Eric Bohanon 99737741f2 MAGETWO-83872: Write metadata service 2017-12-01 14:44:41 -06:00
Eric Bohanon ab0c00b30d MAGETWO-83872: Write metadata service 2017-12-01 14:01:45 -06:00
Alex Paliarush 5d179514df MAGETWO-83859: EAV metadata service and Attribute type resolver 2017-11-30 12:00:47 -06:00
Stanislav Idolov 672139276f MAGETWO-83893: Eliminate @codingStandardsIgnoreFile annotation from codebase 2017-11-15 12:13:10 +02:00
Oleksii Korshenko 231709b4ac MAGETWO-66875: Remove the copyright year from file headers #8648 2017-03-29 19:37:54 +03:00
Sergii Kovalenko eb30343a09 MAGETWO-62855: Copyright Year Update 2017 2017-01-05 13:01:45 +02:00
Joan He 2d368d0134 MAGETWO-48081: Copyright Year Update 2016-03-17 15:49:11 -05:00
Serhiy Shkolyarenko 087c8d0174 MAGETWO-43923: [GitHub]ModelResource namespace inconsistency 
renamed  namespace
 2015-10-12 11:59:28 +03:00
Serhiy Shkolyarenko 3a72e6eeda Merge remote-tracking branch 'mainline/develop' into reserved_words 
Conflicts:
	app/code/Magento/Catalog/etc/di.xml
	app/code/Magento/Catalog/etc/frontend/di.xml
	app/code/Magento/CatalogRule/etc/di.xml
	app/code/Magento/CatalogUrlRewrite/etc/adminhtml/di.xml
	app/code/Magento/CmsUrlRewrite/etc/adminhtml/di.xml
	app/code/Magento/ConfigurableProduct/Test/Unit/Model/ConfigurableProductManagementTest.php
	app/code/Magento/Indexer/etc/di.xml
	app/code/Magento/Reports/etc/adminhtml/di.xml
	app/code/Magento/Reports/etc/di.xml
	app/code/Magento/Sales/Model/ResourceModel/Order/Relation.php
	app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/RelationTest.php
	app/code/Magento/Sales/etc/di.xml
	app/code/Magento/SalesRule/etc/frontend/di.xml
	app/code/Magento/Store/Model/Website.php
	app/code/Magento/Store/etc/data_source/website.xml
	app/code/Magento/Swatches/etc/di.xml
	app/code/Magento/Theme/Model/Theme/Registration.php
	app/code/Magento/User/etc/di.xml
	dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
	dev/tests/performance/framework/Magento/TestFramework/Helper/Categories.php
	dev/tests/performance/testsuite/fixtures/catalog_product.php
	lib/internal/Magento/Framework/Acl/Test/Unit/AclResource/Config/XsdTest.php
	lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/Config/SchemaLocatorTest.php
	setup/src/Magento/Setup/Model/Installer.php
 2015-10-07 21:05:05 +03:00
Serhiy Shkolyarenko 4e204b1a88 MAGETWO-41527: PHP 7 namespace strict compatibility 
renamed ModelResource
 2015-10-07 20:23:13 +03:00
Serhiy Shkolyarenko 587a4ea017 MAGETWO-41527: PHP 7 namespace strict compatibility 
framework resources fixes
 2015-10-07 20:02:46 +03:00
Iryna Lagno 0457cf36cd MAGETWO-41527: PHP 7 namespace strict compatibility 2015-10-07 17:13:45 +03:00
Maksym Savich a36e2b0dd8 MAGETWO-42855: XSD URN format 2015-09-17 18:31:03 -05:00
Joan He 7247f831c8 Merge remote-tracking branch 'ogres/MAGETWO-40848-components-from-vendor' into MAGETWO-42196-xsd 
Conflicts:
	app/code/Magento/Braintree/view/frontend/layout/braintree_paypal_review.xml
	app/code/Magento/BundleImportExport/etc/di.xml
	app/code/Magento/Customer/etc/module.xml
	app/code/Magento/DesignEditor/etc/adminhtml/di.xml
	app/code/Magento/DesignEditor/etc/di.xml
	app/code/Magento/DesignEditor/etc/events.xml
	app/code/Magento/DesignEditor/etc/frontend/di.xml
	app/code/Magento/DesignEditor/etc/frontend/routes.xml
	app/code/Magento/DesignEditor/etc/vde/events.xml
	app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_files_index.xml
	app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_firstentrance.xml
	app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_index.xml
	app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_launch.xml
	app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_loadthemelist.xml
	app/code/Magento/EncryptionKey/etc/module.xml
	app/code/Magento/ImportExport/etc/module.xml
	app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_index.xml
	app/code/Magento/Paypal/view/frontend/layout/paypal_express_review.xml
	app/code/Magento/Paypal/view/frontend/layout/paypal_payflowexpress_review.xml
	app/code/Magento/Sales/etc/resources.xml
	app/code/Magento/Search/etc/module.xml
	app/code/Magento/User/view/adminhtml/layout/adminhtml_locks_grid.xml
	app/code/Magento/Wishlist/view/frontend/layout/wishlist_shared_index.xml
	dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/theme.xml
	dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/theme.xml
	dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php
 2015-09-16 10:07:50 -05:00
Ankur Kaneria 87e83f1b4d MAGETWO-42263: Register non-composer components 
- updates to fix failing api-functional tests
 2015-09-14 15:19:03 -05:00
Joan He e77ec54e54 Merge remote-tracking branch 'ogres/MAGETWO-40848-components-from-vendor' into MAGETWO-42196-xsd 
Conflicts:
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/app/code/community/Namespace/Module/etc/adminhtml.xml
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/app/code/community/Namespace/Module/etc/adminhtml/menu.xml
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/app/code/core/ANamespace/Module/etc/adminhtml.xml
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/app/code/core/ANamespace/Module/etc/adminhtml/menu.xml
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/app/code/core/BNamespace/Module/etc/adminhtml.xml
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/app/code/core/BNamespace/Module/etc/adminhtml/menu.xml
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/app/code/local/Namespace/Module/etc/adminhtml.xml
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/app/code/local/Namespace/Module/etc/adminhtml/menu.xml
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/parse_node_source.xml
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/remove/empty.xml
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/remove/not_empty.xml
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/save/adminhtml.xml
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/update_child_acl_nodes_result.xml
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/update_child_acl_nodes_source.xml
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/update_menu_attributes_result.xml
	dev/tools/Magento/Tools/Migration/Test/Unit/Acl/_files/update_menu_attributes_source.xml
 2015-09-11 12:13:54 -05:00
Maksym Savich 4626d4f0b1 MAGETWO-42196: Magento components loaded from vendor directory - XSD filepath resolution 
- .xsd file references replaced with URNs
 2015-09-10 16:37:48 -05:00
Ankur Kaneria 9825233b95 MAGETWO-42263: Register non-composer components 
- review updates
 2015-09-10 13:09:51 -05:00
Ankur Kaneria 2bd91026d1 MAGETWO-42263: Register non-composer components 
- minor updates to resolve static code anaylysis build issues
 2015-09-10 10:33:00 -05:00
Ankur Kaneria 9ebcbe3e54 MAGETWO-42263: Register non-composer components 
- updates to make api-functional tests work from original location
 2015-09-10 09:51:54 -05:00
Ankur Kaneria 955ada4da2 MAGETWO-42263: Register non-composer components 
- Added registration.php files for various api-functional test modules
- Optimized search algorithm for non-composer registration.php files
 2015-09-09 15:48:20 -05:00
Olexii Korshenko 93312cae42 MAGETWO-37817: Adaptation of code to PHP7 
- Renamed classes and namespaces with reserved words (Object, String, Null, Boolean, etc.)
- Updated dependencies
 2015-07-29 17:55:58 +03:00
Alexander Paliarush ef2cfe2166 MAGETWO-38305: Fix Performance Degradation caused by Join Directive 
- Improved extension attribute config related code structure
 2015-06-04 19:40:52 +03:00
Bryant Luk 590b8e1474 MAGETWO-37074: Rename service_data_attributes.xml to extension_attributes.xml 
- Rename the service_data_attributes.xml file and all associated XSDs to make
  the file's purpose more clear.
- Used to be data_object.xml
 2015-05-06 15:08:04 -05:00
Anup Dugar 8da2718c27 MAGETWO-36062: Add ACL resources configuration section to data_object.xml 
- Refactored custom_attributes node to extension_attributes
- Refactored data_object xml and xsd file to service_data_attributes
 2015-04-19 21:34:49 -05:00
Bryant Luk 28cf7e4869 Merge branch 'develop' into MAGETWO-35266-Update-fails-trying-to-recreate-tables 2015-03-18 15:33:55 -05:00
Ievgen Shakhsuvarov 1289e4e08f MAGETWO-32710: Code micro-optimizations 2015-03-18 12:20:00 +02:00
Anup Dugar 117951cafb MAGETWO-35264: Unable to request Soap service without plugging in CustomAttributeMap config 
- Removed additional whitespace
 2015-03-17 15:35:54 -05:00
Anup Dugar 8e28ce0521 MAGETWO-35264: Unable to request Soap service without plugging in CustomAttributeMap config 
- Fixed WSDL generation to use EavCustomAttributeLocator to list all DataInterface classes for complex custom attribute type
 2015-03-17 15:20:41 -05:00
Eugene Tulika d6c2958d93 MAGETWO-344168: Refactor Extensible Models and Objects to use Extended Attributes 2015-03-15 19:13:25 -05:00
Yu Tang c2c16e4150 MAGETWO-32905: Refactor webapi framework to use factories instead of builders 
- Ignore coding style check for test modules
 2015-03-14 08:33:27 -05:00
Yu Tang 86bf6c6ac8 MAGETWO-32891: Remove code generation of builder & selected hard-coded builders 
- Fix build errors
 2015-03-09 15:23:14 -05:00
Yu Tang 35b96045ed MAGETWO-32905: Refactor webapi framework to use factories instead of builders 
- Fix api-functional tests
 2015-03-06 19:55:09 -06:00
Yu Tang de349e9633 MAGETWO-32905: Refactor webapi framework to use factories instead of builders 
- Fix api-functional test failures
 2015-03-06 16:09:59 -06:00
Yu Tang 0f17411b35 Merge remote-tracking branch 'mainline/develop' into FearlessKiwis-MAGETWO-32905-Refactor-API-Framework 2015-03-05 14:42:08 -06:00
Yu Tang 523c815f21 MAGETWO-32905: Refactor webapi framework to use factories instead of builders 
- Fix api-functional test failures
 2015-03-05 14:14:25 -06:00
Maddy Chellathurai c37462009f Merge remote-tracking branch 'mainline/develop' into develop 
Conflicts:
	app/code/Magento/Core/composer.json
	app/code/Magento/Dhl/composer.json
	app/code/Magento/Fedex/composer.json
	app/code/Magento/Integration/Model/Plugin/Setup.php
	app/code/Magento/Integration/Model/Resource/Setup.php
	app/code/Magento/Integration/etc/frontend/di.xml
	app/code/Magento/OfflineShipping/composer.json
	app/code/Magento/Quote/composer.json
	app/code/Magento/SalesRule/composer.json
	app/code/Magento/Search/composer.json
	app/code/Magento/Usps/composer.json
	app/code/Magento/Webapi/Model/Plugin/Manager.php
	app/code/Magento/Webapi/Model/Plugin/Setup.php
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
	dev/tests/unit/testsuite/Magento/Integration/Model/Plugin/SetupTest.php
	dev/tests/unit/testsuite/Magento/Setup/Module/SetupFactoryTest.php
	dev/tests/unit/testsuite/Magento/Setup/Module/SetupModuleTest.php
	dev/tests/unit/testsuite/Magento/Webapi/Model/Plugin/ManagerTest.php
	dev/tests/unit/testsuite/Magento/Webapi/Model/Plugin/SetupTest.php
	setup/src/Magento/Setup/Module/SetupFactory.php
	setup/src/Magento/Setup/Module/SetupModule.php
 2015-03-03 16:24:16 -06:00
Alexander Paliarush 4d539ed3b3 MAGETWO-34457: Merge and Fix Tests 
- Reverted changes, not intended for current PR
 2015-02-25 13:23:10 +02:00
Maddy Chellathurai fc1a378852 Merge remote-tracking branch 'ogresce/develop' into develop_test 
Conflicts:
	app/code/Magento/Authorization/data/authorization_setup/data-install-2.0.0.php
	app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
	app/code/Magento/Core/etc/di.xml
	app/code/Magento/Core/sql/core_setup/install-2.0.0.php
	app/code/Magento/Cron/etc/module.xml
	app/code/Magento/Dhl/composer.json
	app/code/Magento/Fedex/composer.json
	app/code/Magento/GoogleOptimizer/composer.json
	app/code/Magento/OfflineShipping/composer.json
	app/code/Magento/SalesRule/composer.json
	app/code/Magento/Store/etc/di.xml
	app/code/Magento/Usps/composer.json
	app/code/Magento/Widget/data/widget_setup/data-install-2.0.0.php
	app/code/Magento/Widget/sql/widget_setup/install-2.0.0.php
	dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
	dev/tests/unit/testsuite/Magento/Setup/Model/InstallerTest.php
	dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php
	setup/src/Magento/Setup/Model/Installer.php
	setup/src/Magento/Setup/Model/InstallerFactory.php
	setup/src/Magento/Setup/Module/SetupFactory.php
	setup/src/Magento/Setup/Module/SetupModule.php
 2015-02-24 16:14:28 -06:00
Arkadii Chyzhov c68cdcddf1 Merge remote-tracking branch 'origin/MAGETWO-31929-Extension-Attributes-Generation' into develop 2015-02-24 12:48:52 +02:00
Anup Dugar 9801f1e626 MAGETWO-31901: Implement Attributes Mapping to Data Interfaces 
- Using Magento\Framework\Object VirtualType instance as a container for complex Custom Attribute Types
 2015-02-20 15:29:44 -06:00
Alexander Paliarush 71e0aa4797 Merged mainline/develop into MAGETWO-31929-Extended-Attributes-Object 2015-02-19 12:22:50 +02:00
Anup Dugar 4ffa6f24cc MAGETWO-31901: Implement Attributes Mapping to Data Interfaces 
- Added Configuration for complex attribute classes in Test Service
 2015-02-19 01:18:48 -06:00
Alexander Paliarush 1205cca09b MAGETWO-31937: Exclude Extended Attributes from Custom Attributes List 2015-02-18 17:51:46 +02:00
Ivan Gavryshko 679e8977ad MAGETWO-33884: Changes to database and module.xml 
- renamed schema_version to setup_version in module XML, CE only
- changed core_resource table to have module names instead of resource
- renamed column in core_resource from version to schema_version
 2015-02-10 15:16:04 -06:00
Anup Dugar f16d24e5cf MAGETWO-32668: [GITHUB] Change resource ids from Magento_Adminhtml::* to Magento_Backend #921 
- Replaced Magento_Adminhtml with Magento_Backend
 2015-02-06 00:08:39 -06:00
Ievgen Shakhsuvarov 2c0d42f2ae Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into develop 
Conflicts:
	app/code/Magento/Checkout/Service/V1/Cart/ReadService.php
	app/code/Magento/Checkout/Service/V1/Cart/WriteService.php
	app/code/Magento/Checkout/Service/V1/Data/Cart.php
	app/code/Magento/Checkout/Service/V1/Data/Cart/Customer.php
	app/code/Magento/Checkout/Service/V1/Data/CartMapper.php
	app/code/Magento/Checkout/Service/V1/PaymentMethod/WriteService.php
	app/code/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceInterface.php
	app/code/Magento/Checkout/Service/V1/ShippingMethod/WriteService.php
	app/code/Magento/Checkout/Service/V1/ShippingMethod/WriteServiceInterface.php
	app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
	app/code/Magento/Quote/Model/ShippingMethodManagement.php
	dev/tests/api-functional/testsuite/Magento/Checkout/Service/V1/Address/Shipping/ReadServiceTest.php
	dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php
	dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Billing/WriteServiceTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/ConverterTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/BuilderTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/ConverterTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/ReadServiceTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/TotalsServiceTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/WriteServiceTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Coupon/ReadServiceTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Data/PaymentMethod/ConverterTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Item/ReaderServiceTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/ReadServiceTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceTest.php
	dev/tests/unit/testsuite/Magento/GiftMessage/Service/V1/ReadServiceTest.php
	dev/tests/unit/testsuite/Magento/Quote/Model/Cart/ShippingMethodConverterTest.php
	dev/tests/unit/testsuite/Magento/Quote/Model/CouponManagementTest.php
	dev/tests/unit/testsuite/Magento/Quote/Model/QuoteAddressValidatorTest.php
	dev/tests/unit/testsuite/Magento/Quote/Model/ShippingAddressManagementTest.php
 2015-01-23 15:10:20 +02:00
Dmytro Kvashnin d29473907d Merge remote-tracking branch 'main_ce/develop' into static_tests 
Conflicts:
	app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
	app/code/Magento/Checkout/Controller/Onepage.php
	app/code/Magento/Checkout/Model/Cart.php
	app/code/Magento/Checkout/Model/Type/Onepage.php
	app/code/Magento/Quote/Model/Quote.php
	app/code/Magento/Quote/Model/Quote/Address.php
	app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
	app/code/Magento/Quote/Model/Quote/Item.php
	app/code/Magento/Quote/Model/Resource/Quote.php
	app/code/Magento/Sales/Model/Convert/Quote.php
	app/code/Magento/Sales/Model/Service/Quote.php
	dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
	dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Backend/CustomerQuoteTest.php
	dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Frontend/Quote/Address/CollectTotalsTest.php
	dev/tests/unit/testsuite/Magento/Quote/Model/Quote/AddressTest.php
	dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/CompareTest.php
	dev/tests/unit/testsuite/Magento/Quote/Model/Quote/ItemTest.php
	dev/tests/unit/testsuite/Magento/Quote/Model/QuoteTest.php
 2015-01-21 15:57:04 +02:00