Commit Graph
44 Commits
Author SHA1 Message Date
Sergii Kovalenko aaa346e6a1 Merge branch '2.3-develop' of https://github.com/magento/magento2ce into MAGETWO-87551 2018-02-16 17:40:11 +02:00
Sergii Kovalenko 083678cfc6 MAGETWO-87551: Convert existing data install/upgrade scripts
--fix L1
2018-02-14 00:22:05 +02:00
Dmytro Vilchynskyi 143b1fc119 MAGETWO-84702: [SE Dev] Error Messages edits, part 1 (966 of 1166 total)
- several messages are updated
2018-01-24 14:22:46 +02:00
Dmytro Vilchynskyi f7856beb1d MAGETWO-84702: [SE Dev] Error Messages edits, part 1 (966 of 1166 total)
- several messages are updated
2018-01-22 18:46:35 +02: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
Alexander Paliarush 842c92f97c MAGETWO-51366: Constants must not be used as first argument of translation function 2016-04-27 17:17:47 -05:00
Joan He 2d368d0134 MAGETWO-48081: Copyright Year Update 2016-03-17 15:49:11 -05: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
Maxim Shikula 0115c1801d MAGETWO-34991: Eliminate exceptions from the list Part2 2015-03-30 10:03:04 +03:00
Maxim Shikula c6be7da735 MAGETWO-34991: Eliminate exceptions from the list Part2 2015-03-27 18:27:43 +02:00
Yuri Kovsher 219dc6b4ea MAGETWO-34991: Eliminate exceptions from the list Part2 2015-03-25 18:39:39 +02:00
Maxim Shikula 3b88edf059 MAGETWO-34991: Eliminate exceptions from the list Part2 2015-03-24 16:25:55 +02:00
Maxim Shikula b34a7f3b0f MAGETWO-34991: Eliminate exceptions from the list Part2 2015-03-24 16:18:31 +02:00
Maxim Shikula 5a7076a24c Merge remote-tracking branch 'magento2/develop' into MAGETWO-34878
Conflicts:
	app/code/Magento/Bundle/Model/LinkManagement.php
	app/code/Magento/Catalog/Model/ProductLink/Repository.php
	app/code/Magento/Catalog/Model/ProductRepository.php
	app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
	app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
	lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php
	lib/internal/Magento/Framework/Reflection/TypeProcessor.php
2015-03-16 10:35:55 +02:00
Eugene Tulika d6c2958d93 MAGETWO-344168: Refactor Extensible Models and Objects to use Extended Attributes 2015-03-15 19:13:25 -05:00
U-CORP\vpaladiychuk acec2d52a7 Merge remote-tracking branch 'mainline/develop' into MAGETWO-34878 2015-03-15 14:36:27 +02: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 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
Yuri Kovsher 2d3a6cd258 MAGETWO-34237: Change instantiation of LocalizedException in the whole system 2015-03-06 17:38:11 +02:00
Yurii Torbyk 38686becb9 MAGETWO-34237: Change instantiation of LocalizedException in the whole system 2015-03-06 02:28:04 +02:00
Yuri Kovsher 3936136d07 Merge remote-tracking branch 'main-ce/develop' into MAGETWO-34233 2015-03-05 12:17:12 +02:00
Yuri Kovsher f18d275bd8 MAGETWO-34237: Change instantiation of LocalizedException in the whole system 2015-03-04 12:38:09 +02:00
Yurii Torbyk 0cbee7b11b Merge remote-tracking branch 'm2ce/develop' into MAGETWO-34233
Conflicts:
	app/code/Magento/Integration/Service/V1/AdminTokenService.php
	lib/internal/Magento/Framework/Webapi/Exception.php
2015-03-04 10:12:55 +02: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
Yuri Kovsher 67428e14c3 MAGETWO-34237: Change instantiation of LocalizedException in the whole system 2015-03-02 17:25:57 +02:00
Yuri Kovsher 36d6eb1817 MAGETWO-34237: Change instantiation of LocalizedException in the whole system 2015-03-02 12:06:16 +02:00
Yuri Kovsher 17dce88e12 MAGETWO-34237: Change instantiation of LocalizedException in the whole system 2015-02-26 19:20:49 +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
Cari Spruiell 78dc4740a0 MAGETWO-33456: [Code Quality] Improve Code Structuring
- fixed static tests
- moved Magento\Webapi\Model\Cache\Type to Magento\Framework\App\Cache\Type\Webapi and refactored usages
2015-02-19 10:24:47 -06:00
Cari Spruiell f64d4438e6 MAGETWO-33456: [Code Quality] Improve Code Structuring
- Initial implementation
2015-02-13 10:50:25 -06: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
Vlad Veselov a9e5897bf6 MAGETWO-32146: Copying and Copyright Year Update
- update all files with tool
2015-01-09 10:11:39 -05:00
Yuxing Zheng c05f3469e8 MAGETWO-32105: Add api-functional tests 2015-01-05 11:07:55 -06:00