Commit Graph
172 Commits
Author SHA1 Message Date
pradeep1819 7262162d90 ACP2E-1709: error during declarative schema whitelsit generation 2023-03-24 22:45:11 +05:30
pradeep1819 438c8276ba ACP2E-1709: error during declarative schema whitelsit generation 2023-03-15 17:55:49 +05:30
pradeep1819 13d1bd2718 ACP2E-1709: error during declarative schema whitelsit generation 2023-03-13 20:26:17 +05:30
pradeep1819 120a95614a ACP2E-1709: error during declarative schema whitelsit generation 2023-03-13 20:25:22 +05:30
pradeep1819 a6edf232ae ACP2E-1709: error during declarative schema whitelsit generation 2023-03-10 10:53:27 +05:30
pradeep1819 647542f668 ACP2E-1709: error during declarative schema whitelsit generation 2023-03-09 13:02:37 +05:30
pradeep1819 c1f1cf5203 ACP2E-1709: error during declarative schema whitelsit generation 2023-03-07 20:23:43 +05:30
pradeep1819 4420bfe4a6 ACP2E-1709: error during declarative schema whitelsit generation 2023-03-06 16:51:18 +05:30
Andrii Beziazychnyi 8e6aedc813 CE-32868: Fixed the codebase to take a compatibility 2021-07-20 17:37:05 +03:00
Pavel Bystritsky f476d89951 Merge branch '2.4-develop' into 2.4.0-sync
# Conflicts:
#	app/code/Magento/Backend/etc/adminhtml/system.xml
#	app/code/Magento/Backend/i18n/en_US.csv
#	app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
#	app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml
#	app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
#	app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
#	app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
#	app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml
#	app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
#	app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleForCustomerGroupTest.xml
#	app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
#	app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
#	app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
#	app/code/Magento/Checkout/Block/Cart/Crosssell.php
#	app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartTest.xml
#	app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
#	app/code/Magento/Config/Console/Command/ConfigShowCommand.php
#	app/code/Magento/Contact/view/frontend/templates/form.phtml
#	app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertAdminCustomerNoItemsInWishlistActionGroup.xml
#	app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
#	app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
#	app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
#	app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewIntegrationTest.xml
#	app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml
#	app/code/Magento/Theme/etc/di.xml
#	app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
#	composer.lock
#	dev/tests/api-functional/phpunit_graphql.xml.dist
#	dev/tests/api-functional/phpunit_rest.xml.dist
#	dev/tests/api-functional/phpunit_soap.xml.dist
#	dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php
#	dev/tests/integration/testsuite/Magento/Framework/View/LayoutTestWithExceptions.php
#	lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
#	lib/internal/Magento/Framework/View/Layout/GeneratorPool.php
2020-07-21 17:57:16 +03:00
Harald Deiser d091135083 MC-34429: Plugin on Magento\Framework\Encryption\Encryptor breaks Magento 2020-05-28 11:41:19 +02:00
Viktor Sevch 1d87a8ff8e Merge remote-tracking branch 'origin/MC-24063' into MC-29420
# Conflicts:
#	app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml
#	app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml
#	app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml
#	app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
2020-04-23 09:37:22 +03:00
Viktor Sevch 39a6e2b503 MC-29420: Remove event handlers from CE 2020-04-22 16:35:38 +03:00
Bartłomiej Szubert 566604806a Cleanup ObjectManager usage - Magento_Developer 2020-03-30 10:25:03 +02:00
Manuel Canepa 4d70d26317 Fix typo 2020-01-16 10:17:44 -03:00
Manuel Eduardo Cánepa CihueloandIhor Sviziev b2177742d1 Update app/code/Magento/Developer/Model/XmlCatalog/Format/VsCode.php
Co-Authored-By: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
2020-01-16 10:14:20 -03:00
Manuel Canepa 779c9ae5d7 Add comments on tests and output files 2020-01-13 17:19:09 -03:00
Manuel Canepa c540a599d5 Add Unit Tests 2020-01-09 13:36:01 -03:00
Manuel Canepa 155e8a988b Add format fixes 2020-01-08 01:09:08 -03:00
Manuel Canepa 0c4cb77402 Add Visual Code catalog generator 2020-01-07 13:14:45 -03:00
Jeroen Boersma 693a625058 Second iteration use re-added readDirectory relative path
Use currentReaddir to make relative paths.
Second iteration which uses way less code with the same result.

- removed realpath usage
- removed dirname usage
- removed unused method
- removed unused constant
2019-06-26 08:50:37 +00:00
Jeroen Boersma d269dddf92 Converted internals to private methods
* internally used code is no longer public
2019-06-26 08:34:54 +00:00
Jeroen Boersma 79a108720a Revert "Removed unused parameter from constructor"
This reverts commit 0db89b2dd4.
2019-06-26 10:30:58 +02:00
Jeroen Boersma c50595efe1 Revert "Processed phpcs feedback"
This reverts commit 211fe95022.
2019-06-26 10:29:25 +02:00
Jeroen Boersma 211fe95022 Processed phpcs feedback
- removed unused import
- removed unused @param
2019-06-17 20:52:30 +00:00
Jeroen Boersma 767af1fa97 Resolve $PROJECT_DIR$ when generating PHPStorm xml 2019-06-17 15:11:24 +00:00
Jeroen Boersma 0db89b2dd4 Removed unused parameter from constructor 2019-06-17 15:09:47 +00:00
Dmytro Horytskyi 39b1662092 Merge branch '2.3-develop' of https://github.com/magento/magento2ce into PR-0204 2019-02-11 16:53:53 +02:00
Max Lesechko b59f9d9f5c MC-6275: Conflict of simultaneous write in Redis cache 2019-02-05 17:49:57 -06:00
Oleksandr Iegorov 87cb1e6513 MAGETWO-97566: Unable to run setup:db-declaration:generate-whitelist 2019-01-22 12:53:34 -06:00
Max Lesechko acdc770ac2 MC-6275: Conflict of simultaneous write in Redis cache 2019-01-18 09:05:48 -06:00
Max Lesechko d6b614fc94 MAGETWO-95595: Index names are ignored by declarative schema 2018-10-22 14:58:59 -05:00
Max Lesechko b9af73aac0 MAGETWO-95595: Index names are ignored by declarative schema 2018-10-22 13:52:55 -05:00
Max Lesechko bca0e5e9e9 MAGETWO-95595: Index names are ignored by declarative schema 2018-10-22 10:52:53 -05:00
Alexander Shkurko 74adebd34e [Forwardport] dev:di:info duplicates plugin info 2018-07-09 21:20:24 +03:00
Oleh Posyniak 79bd644968 MAGETWO-92877: Write Core Application Logs to Syslog 2018-06-19 15:26:19 -05:00
Magento EngCom Team 402b719168 ⏫ Forwardport of magento/magento2#11686 to 2.3-develop branch
Applied pull request patch https://github.com/magento/magento2/pull/11686.patch (created by @tdgroot) based on commit(s):
  1. 177e540938631fbb749dcc028d4f8f864e290b4e
  2. 0d652139889d882dd6646741070e12d04ebd8a5b
  3. a781bf6f75c74a6e871f1640ae679b18967ac000
  4. dcc480d15c9f0c1aca77974d5cd89a972f1d32dd
  5. 5d4e1c29ca7d0a62a3465dd7b98a5c30d1410845
  6. b552dd1be35436e05065d8269dabe6cebfaaafcd
  7. b85b91e4fa5c41fe337accd4709b184d7811cd65

Fixed GitHub Issues in 2.3-develop branch:
  - magento/magento2#5188: Error generating URN-catalog when blank one exists (reported by @JamesonNetworks)
2018-01-24 12:13:26 -06:00
Stanislav Idolov 672139276f MAGETWO-83893: Eliminate @codingStandardsIgnoreFile annotation from codebase 2017-11-15 12:13:10 +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
Magento CICD 9f0a1fa7d1 merge magento/2.2-develop into magento-frontend/PR_09_08 2017-08-14 02:33:35 -07: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 b2ce2a37d9 MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags
- added @since tag to all @api classes
2017-08-11 15:26:37 -05:00
Dmytro Vilchynskyi 2d09bd0030 Merge remote-tracking branch 'origin/MAGETWO-70571' into PR_09_08
# Conflicts:
#	app/code/Magento/Deploy/Model/Mode.php
#	app/code/Magento/Deploy/Test/Unit/Model/ModeTest.php
2017-08-09 16:48:16 +03:00
Oleksii Korshenko 4b5626478a MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags
- replaced release version with package version in @since and @depreacated tags
 - removed @since tag from private properties/methods  and non @api classes
2017-08-04 19:15:55 -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 57b984803d MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags
- fixed missing items
2017-07-28 16:54:38 -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
Karpenko, Oleksandr 953b4ebfce MAGETWO-70571: There is no possibility to activate DEBUG logging in production mode 2017-07-19 12:58:47 +03:00