Commit Graph
8 Commits
Author SHA1 Message Date
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
Anton Kaplya 074b3abc68 MAGETWO-50676: EntityManager introduction 2016-03-23 00:48:52 +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
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 Shakhsuvarov ece911bf71 MAGETWO-46237: CatalogRule module refactoring 2015-12-08 15:57:13 +02:00
Ievgen Shakhsuvarov ee12dc7855 MAGETWO-46237: CatalogRule module refactoring 2015-12-08 15:56:45 +02:00