Commit Graph
17 Commits
Author SHA1 Message Date
Thomas Klein e735178bdf add block config source 2018-08-14 14:22:15 +00: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
Michael Logvin 6fed466ebe Merge branch 'develop' into MAGETWO-50676 2016-04-06 12:49:33 +03:00
Maxim Medinskiy 0962872577 MAGETWO-49939: Merchant can't assign CMS Page to few storeviews 2016-04-01 19:33:14 +03:00
Maxim Medinskiy ffd33efeee MAGETWO-49939: Merchant can't assign CMS Page to few storeviews 2016-04-01 14:26:07 +03: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
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
Oleksandr Karpenko 327044e42d MAGETWO-46485: Update queries using new table scheme 2015-12-17 19:29:36 +02:00
Sviatoslav Mankivskyi f6e5e9cbca MAGETWO-46490: Stabilization 2015-12-16 18:30:37 +02:00
Sergey Semenov c9956d3b00 MAGETWO-46485: Update queries using new table scheme 2015-12-16 17:44:33 +02:00
Sergey Semenov 118737eb93 MAGETWO-46485: Update queries using new table scheme 2015-12-14 19:46:45 +02:00
Serhiy Shkolyarenko 087c8d0174 MAGETWO-43923: [GitHub]ModelResource namespace inconsistency
renamed  namespace
2015-10-12 11:59:28 +03:00
Serhiy Shkolyarenko 4e204b1a88 MAGETWO-41527: PHP 7 namespace strict compatibility
renamed ModelResource
2015-10-07 20:23:13 +03:00
Iryna Lagno 0457cf36cd MAGETWO-41527: PHP 7 namespace strict compatibility 2015-10-07 17:13:45 +03:00
Serhiy Shkolyarenko db5189c91d MAGETWO-41527: PHP 7 namespace strict compatibility
- Updated Magento_Cms module for PHP 7 compatibility
2015-10-06 17:39:13 +03:00