bdnugget/magento2
1
0 Fork 0
mirror of https://github.com/bdnugget/magento2.git synced 2026-11-07 09:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
143,425 Commits 1 Branch 0 Tags
2.4-develop
Commit Graph
21 Commits
Author SHA1 Message Date
Bartłomiej Szubert 566604806a Cleanup ObjectManager usage - Magento_Developer 2020-03-30 10:25:03 +02:00
Oleksii Korshenko 1fda0a603b MAGETWO-71802: Option to enable template hints on frontend with a configurable parameter #10608 2017-08-28 13:39:11 -05:00
DominicWatts d143e5de14 backward compatiblity, review changes 2017-08-22 21:49:50 +01:00
DominicWatts d18887c816 Option to enable template hints on frontend with a configurable parameter 2017-08-21 22:23:24 +01:00
Oleksii Korshenko e60d3a2d8f MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags 
- removed useless class docBlocks
 2017-08-11 15:41:59 -05:00
Oleksii Korshenko 56af1e73ce MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags 
- removed @since 2.0.0 as it is a base release
 - updated version in @since and @deprecated tag taking into account all patch releases
 2017-08-02 14:14:33 -05:00
Oleksii Korshenko bd74370771 MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags 
- added release number to all existing @deprecated tag in php classes, methods and properties (app/code/Magento, lib/internal/Magento, setup/src/Magento/Setup)
 - added tag @since to all existing php classes, methods and properties (app/code/Magento, lib/internal/Magento, setup/src/Magento/Setup)
 2017-07-28 15:43:18 -05: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
Sergey Semenov d6ad76bc97 MAGETWO-42867: Separate template hints enabling for Storefront and Admin 2015-09-24 17:39:01 +03:00
Sergey Semenov 4a08a444f7 MAGETWO-42867: Separate template hints enabling for Storefront and Admin 2015-09-23 20:32:46 +03:00
Bohdan Korablov 48f7eaf177 MAGETWO-42869: Template hints are shown in Admin when scope is website or storeview 2015-09-21 18:41:12 +03:00
Dale Sikkema fb705218e4 Merge remote-tracking branch 'mainline/develop' into develop 
Conflicts:
	app/code/Magento/Backend/App/Router.php
	app/code/Magento/Backend/Helper/Dashboard/Data.php
	app/code/Magento/Backend/Helper/Dashboard/Order.php
	app/code/Magento/Captcha/Helper/Data.php
	app/code/Magento/Catalog/Controller/Product/Compare.php
	app/code/Magento/Catalog/Controller/Product/Compare/Index.php
	app/code/Magento/Catalog/Helper/Category.php
	app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
	app/code/Magento/CatalogInventory/Helper/Stock.php
	app/code/Magento/CatalogInventory/Model/Configuration.php
	app/code/Magento/CatalogInventory/Model/Resource/Stock.php
	app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php
	app/code/Magento/CatalogSearch/Controller/Result/Index.php
	app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
	app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
	app/code/Magento/Checkout/Controller/Cart.php
	app/code/Magento/Checkout/Controller/Cart/Add.php
	app/code/Magento/Checkout/Controller/Cart/Configure.php
	app/code/Magento/Checkout/Controller/Cart/CouponPost.php
	app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
	app/code/Magento/Checkout/Controller/Cart/Index.php
	app/code/Magento/Checkout/Helper/Cart.php
	app/code/Magento/Checkout/Helper/Data.php
	app/code/Magento/Cms/Model/Resource/AbstractCollection.php
	app/code/Magento/Cms/Model/Resource/Page/Collection.php
	app/code/Magento/Cookie/Helper/Cookie.php
	app/code/Magento/Core/Helper/Data.php
	app/code/Magento/Core/etc/di.xml
	app/code/Magento/CurrencySymbol/Helper/Data.php
	app/code/Magento/Customer/Controller/Account/Confirmation.php
	app/code/Magento/Customer/Controller/Account/LoginPost.php
	app/code/Magento/Customer/Helper/Address.php
	app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
	app/code/Magento/Customer/Model/CustomerRegistry.php
	app/code/Magento/Customer/Model/GroupManagement.php
	app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php
	app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
	app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
	app/code/Magento/Developer/composer.json
	app/code/Magento/Directory/Controller/Currency/SwitchAction.php
	app/code/Magento/Directory/Helper/Data.php
	app/code/Magento/Directory/Model/PriceCurrency.php
	app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
	app/code/Magento/Downloadable/Helper/Download.php
	app/code/Magento/Eav/Helper/Data.php
	app/code/Magento/GiftMessage/Helper/Message.php
	app/code/Magento/GoogleAnalytics/Helper/Data.php
	app/code/Magento/GoogleOptimizer/Helper/Data.php
	app/code/Magento/ImportExport/Helper/Data.php
	app/code/Magento/Msrp/Helper/Data.php
	app/code/Magento/Msrp/Model/Config.php
	app/code/Magento/Newsletter/Controller/Manage/Save.php
	app/code/Magento/Newsletter/Controller/Subscriber.php
	app/code/Magento/Persistent/Helper/Data.php
	app/code/Magento/Persistent/Helper/Session.php
	app/code/Magento/Quote/Model/Quote/Item/Processor.php
	app/code/Magento/Quote/Model/QuoteRepository.php
	app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
	app/code/Magento/Review/Controller/Product.php
	app/code/Magento/Review/Helper/Data.php
	app/code/Magento/Sales/Helper/Guest.php
	app/code/Magento/Sales/Helper/Reorder.php
	app/code/Magento/SalesRule/Helper/Coupon.php
	app/code/Magento/Search/Helper/Data.php
	app/code/Magento/Search/Model/Query.php
	app/code/Magento/Sendfriend/Helper/Data.php
	app/code/Magento/Shipping/Helper/Data.php
	app/code/Magento/Store/Block/Store/Switcher.php
	app/code/Magento/Store/Block/Switcher.php
	app/code/Magento/Store/Model/Store.php
	app/code/Magento/Store/Model/StoreManager.php
	app/code/Magento/Store/etc/di.xml
	app/code/Magento/Tax/Helper/Data.php
	app/etc/di.xml
	composer.lock
	dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
	dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
	dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
	dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
	dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php
	dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
	dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/ProcessorTest.php
	dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php
	dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php
	dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
	dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
	lib/internal/Magento/Framework/App/Router/Base.php
	lib/internal/Magento/Framework/Url/RouteParamsResolver.php
	lib/internal/Magento/Framework/Url/ScopeResolver.php
	lib/internal/Magento/Framework/View/Model/Layout/Merge.php
 2015-02-13 16:10:03 -06:00
Joan He b10ff958a7 MAGETWO-32374: moved isDevAllowed() method in \Magento\Core\Helper\Data 2015-02-04 14:30:35 -06:00
Alexander Paliarush 722851c54f MAGETWO-33562: Move StoreManagerInterface back from Framework to App 2015-02-03 15:24:33 +02:00
Joan He 6419602c13 Merge remote-tracking branch 'upstream/develop' into MAGETWO-31493-helper-components 
Conflicts:
	app/code/Magento/Core/Helper/Data.php
	app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
	app/code/Magento/Downloadable/Model/Product/Type.php
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
	dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php
 2015-01-30 14:17:45 -06:00
Yuxing Zheng cb59ad4167 Merge remote-tracking branch 'origin/MAGETWO-31506-Move-URL-Components-From-The-Magento-Core-Module' into develop 
Conflicts:
	app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
	app/code/Magento/Email/Model/AbstractTemplate.php
	app/code/Magento/Email/Model/BackendTemplate.php
	app/code/Magento/Email/Model/Template.php
	app/code/Magento/Newsletter/Model/Queue.php
	app/code/Magento/Newsletter/Model/Template.php
	app/code/Magento/Store/Model/Storage/Db.php
	app/etc/di.xml
	dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
	lib/internal/Magento/Framework/Url/RouteParamsResolver.php
 2015-01-23 15:45:13 -06:00
Yuxing Zheng 92cb085fc7 Merge remote-tracking branch 'origin/MAGETWO-31504_MoveDebugHintsToMagentoDeveloperModule' into develop 
Conflicts:
	app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php
	app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
 2015-01-23 15:31:52 -06:00
Cari Spruiell f758b03b71 MAGETWO-32641: Move Magento\Core\Model\TemplateEngine\Decorator\DebugHints.php to the Magento_Developer module 
- moved class and test and updated references
 2015-01-15 14:56:47 -06:00
Bryant Luk f1f6ecf6f0 MAGETWO-32642: Move Magento\Core\Model\TemplateEngine\Plugin\DebugHints.php to the Magento_Developer module 
- Move code and configuration
 2015-01-15 14:39:20 -06:00