Commit Graph
20 Commits
Author SHA1 Message Date
Olga Kopylova 8203eb3785 Merge remote-tracking branch 'mainline/develop' into okopylova-api 2017-04-14 15:27:54 -05:00
Oleksii Korshenko 1b5dc60a26 MAGETWO-66875: Remove the copyright year from file headers #8648 2017-03-29 04:48:40 +03:00
Olga Kopylova 4fd99432b7 MAGETWO-66504: Add @api Annotation in Developer Module 2017-03-21 21:22:06 -05:00
Vlad Veselov 002d771100 [PSR-2 Compliance] Fix #8612: Hundreds of PHPCS-based static tests violations in mainline
- apply automatic PHPCBF fixes to make PHPCS happy
- Step 0. Install phpcs globally: composer global require squizlabs/php_codesniffer:2.8.0
- Step 1. Execute tool to fix PSR-2 violations in PHP files: ~/.composer/vendor/squizlabs/php_codesniffer/scripts/phpcbf --standard=PSR2 --extensions=php --ignore=generated/*,vendor/*,var/* .
2017-03-11 13:45:04 +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
Viktor Paladiychuk 88fbc6a71e MAGETWO-49175: Wrong behavior of "Client side less compilation" type 2016-05-18 18:34:37 +03:00
Joan He 2d368d0134 MAGETWO-48081: Copyright Year Update 2016-03-17 15:49:11 -05:00
Joan He 18bf1a3694 Merge remote-tracking branch 'upstream/develop' into MAGETWO-43857-invalidate-cache
Conflicts:
	app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
	app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
	app/code/Magento/Config/Model/Config/Backend/Translate.php
	app/code/Magento/Contact/Test/Unit/Model/System/Config/Backend/LinksTest.php
	app/code/Magento/Rss/Model/System/Config/Backend/Links.php
	app/code/Magento/Theme/Model/Design/Backend/Theme.php
	lib/internal/Magento/Framework/App/Config/Value.php
2015-10-21 16:49:36 -05:00
Joan He 797556ac47 MAGETWO-43857: [github] cache types don't properly invalidate all the time #1844 2015-10-13 13:40:25 -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
Ji Lu fe5b99bdcf MAGETWO-41958: Added Escape Html in Developer Clients Restrictions. 2015-09-08 10:12:38 -05:00
Alexander Paliarush 4e22e06dc0 MAGETWO-38281: Change the ExtensionAttributesFactory to not use Magento\Framework\App\Resource
- Renamed abstract DB collection
2015-06-08 16:19:32 +03:00
Ji Lu 82761452fa MAGETWO-15665: Removed extra spaces. 2015-04-02 16:06:44 -05:00
Ji Lu 8190b9d5c2 MAGETWO-15665: Addressed a few static code analysis issues 2015-04-02 14:46:19 -05:00
Ji Lu 810f7b16a7 MAGETWO-15665: moved the "restrict" group configuration from backend into Developer module. 2015-04-01 10:51:48 -05:00
Ji Lu e0961f58fa MAGETWO-15665: Added validation for Developer Client Restriction field 2015-03-27 17:30:21 -05:00
Ji Lu 1c6faea0d2 MAGETWO-15665:Added validation for Developer Client Restriction field 2015-03-25 10:23:23 -05:00