Commit Graph
39 Commits
Author SHA1 Message Date
Nikita Shcherbatykh c8baed5750 MC-30963: [Magento Cloud] CMS blocks with identical identifiers 2020-02-05 13:57:49 +02:00
Veronika Kurochkina e61b23a8e5 MAGETWO-91559: Static blocks with same ID appear in place of correct block
- Fix static test
2018-09-17 10:42:58 +03:00
Yurii Borysov 1f743bd7fd MAGETWO-91559: Static blocks with same ID appear in place of correct block 2018-08-28 11:05:29 +03:00
Oscar Recio 5cce625020 Add Current Date to update_time Field Block and Page 2017-12-18 14:54:02 +01:00
Thiago Lima fca3b5e7b7 Changed Validation to get store for block #11601 2017-11-01 08:28:26 +00:00
Thiago Lima b0add65a55 #8236 FIX CMS blocks 2017-10-27 12:25:43 +02: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
Igor Melnikov e28fa690f8 MAGETWO-50549: Create Hydrator that allows convert data interface to array and array to data interface
Adding Hydrator
2016-05-12 21:27:32 -05:00
Nadiya Syvokonenko 11da2d6c92 MAGETWO-50676: EntityManager introduction 2016-04-05 15:30:13 +03:00
Anton Kaplya 2a1c6936ab MAGETWO-50676: EntityManager introduction 2016-03-31 19:01:25 +03:00
Anton Kaplya 0428cb7bb8 MAGETWO-50676: EntityManager introduction 2016-03-23 14:11:05 +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
Stanislav Lopukhov a0145b9468 Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-49154-updated
Conflicts:
	app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php
	app/code/Magento/Cms/Model/ResourceModel/Block.php
	app/code/Magento/Cms/Model/ResourceModel/Page.php
2016-03-21 12:05:23 +02:00
Anton Kaplya 45f154e22f MAGETWO-50676: EntityManager introduction 2016-03-20 13:40:14 +02:00
Joan He 056ad90b7e Merge remote-tracking branch 'upstream/develop' into MAGETWO-48081-copyright
Conflicts:
	app/code/Magento/SalesRule/view/base/web/js/form/element/coupon-tab-updater-checkbox.js
	app/code/Magento/SalesRule/view/base/web/js/form/element/coupon-tab-updater-select.js
	dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Product/Edit/Tab/Reviews.php
	dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewsTab.php
	lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
2016-03-18 10:14:14 -05:00
Joan He 2d368d0134 MAGETWO-48081: Copyright Year Update 2016-03-17 15:49:11 -05:00
Oleksandr Karpenko 016d9fd95e MAGETWO-49965: Remove abstract controllers (save, delete) from staging 2016-03-09 19:02:57 +02:00
Anton Kaplya 757bf888a1 MAGETWO-49702: EntityManager usage unification 2016-02-24 16:13:04 +02:00
Sviatoslav Mankivskyi 5e13a5f6bc MAGETWO-47168: Stabilization 2016-01-21 13:25:14 +02:00
Oleksandr Karpenko ed640b162b MAGETWO-47453: Refactor CMS page/block resource models to use entity manager while deleting 2015-12-31 12:20:05 +02:00
Oleksandr Karpenko 940bbe2f19 MAGETWO-47453: Refactor CMS page/block resource models to use entity manager while deleting 2015-12-31 12:13:30 +02:00
Oleksandr Karpenko e35562afe1 MAGETWO-47453: Refactor CMS page/block resource models to use entity manager while deleting 2015-12-29 12:58:53 +02:00
Oleksandr Karpenko 3f9b9d46a0 MAGETWO-46487: Change Resource model, introduce metadata configuration for CMS Page 2015-12-21 18:57:27 +02:00
Oleksandr Karpenko 6c0186ea29 Merge branch 'MAGETWO-41241' of https://github.corp.magento.com/magento-south/magento2ce into MAGETWO-41241 2015-12-18 18:36:38 +02:00
Oleksandr Karpenko ea768ef694 MAGETWO-46483: Create sequence table for CMS pages 2015-12-18 18:36:03 +02:00
Sviatoslav Mankivskyi fc37dedcf1 MAGETWO-46485: Update queries using new table scheme 2015-12-18 12:43:26 +02:00
Sviatoslav Mankivskyi f6e5e9cbca MAGETWO-46490: Stabilization 2015-12-16 18:30:37 +02:00
Sergey Semenov 2755ea3905 MAGETWO-46504: Update queries using new table scheme 2015-12-16 17:44:49 +02:00
Sviatoslav Mankivskyi e391fb0db7 MAGETWO-46876: Refactor Cms page loading using identifier 2015-12-16 12:20:55 +02:00
Sergey Semenov 6aafcb62f2 MAGETWO-46504: Update queries using new table scheme 2015-12-15 20:13:11 +02:00
Sviatoslav Mankivskyi 87aa1b7f1a MAGETWO-46876: Refactor Cms page loading using identifier 2015-12-15 18:36:14 +02:00
Sergey Semenov c51ac329fe MAGETWO-46504: Update queries using new table scheme 2015-12-15 18:24:33 +02:00
Oleksandr Karpenko 11efd518af MAGETWO-46484: Migration of CMS pages 2015-12-14 11:33:15 +02:00
Igor Melnikov 323966c0ce MAGETWO-44548: Remove logic that set created_at and updated_at fields before saving to database in all modules
Removing setting created_at and updated_atfields
2015-10-31 19:28:52 -05: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