forked from magento/magento2
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Forwardport] Corrected Magento_Framework's test xml file. #22
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ype UI - reset the entity type in the export form JS - this change was made so that if you choose an entity type, then choose the "Please Select" option the entity type gets reset and so now if you choose another type the form will actually be shown
- update the sample csv for customer to remove columns reward_update_notification and reward_warning_notification - after this PR is merged you will be able to download the sample customer csv and import it directly without getting an error message
…t category initialization to 0. Would otherwise be null and set to 1 in \Magento\Catalog\Model\ResourceModel\Collection\AbstractCollection::getStoreId, leading to unwanted store values for category names.
[Forwardport] magento#16079 translation possibility for moreButtonText
… product in admin
… product in admin - fix static test failures
… product in admin - deprecate old truncate
…heck before attribute validation. Add check if the required attribute is not empty after trimming.
…ded check to also check column name so several columns in the same row may throw the same error and they can be distinguished.
… according to code change. For category identification, admin name must be used.
- Merge Pull Request magento#16909 from ishakhsuvarov/magento2:stabilize-travis-integration-tests - Merged commits: 1. bcc9320
Accepted Public Pull Requests: - magento#16838: [Forwardport] Correctly save Product Custom Option values (by @JeroenVanLeusden) - magento#16829: [Forwardport] Fix responsive tables showing broken heading (by @ronak2ram) - magento#16834: [Forwardport] Smallest codestyle fix in Option/Type/Text.php (by @mage2pratik) - magento#16817: [Forwardport] Fix zero price simple failed to resolve as default (by @mage2pratik) - magento#16808: [forwardport] fix magento#16764 Rating Star issue on Product detail Page. (by @Karlasa) - magento#16803: [Forwardport] magento#16685 Updated security issues details (by @quisse) - magento#16792: [Forwardport] Add sort order to user agent rules table headers (by @JRhyne) - magento#16413: [Forwardport] Fixing a Mistype Error (by @tiagosampaio) - magento#16767: [Forwardport] Improve attribute checking (by @FreekVandeursen) - magento-engcom/import-export-improvements#110: magento-engcom/import-export-improvements#44: Update the sample customer csv (by @dmanners) - magento-engcom/import-export-improvements#112: magento-engcom/import-export-improvements#88: Set store id on import product category initialization to 0 (by @pogster) - magento-engcom/import-export-improvements#113: magento-engcom/import-export-improvements#30: Validation should fail when a required field is supplied but is empty after trimming (by @pogster) Fixed GitHub Issues: - magento#5067: Custom option values do not save correctly (reported by @samtay) has been fixed in magento#16838 by @JeroenVanLeusden in 2.3-develop branch Related commits: 1. 955fbf2 2. db95d8a - magento#16764: Rating Star issue on Product detail Page. (reported by @Sathishkumar8731) has been fixed in magento#16808 by @Karlasa in 2.3-develop branch Related commits: 1. 1dd2017 - magento#16703: User Agent Rules table headers do match content of rows. (reported by @JRhyne) has been fixed in magento#16792 by @JRhyne in 2.3-develop branch Related commits: 1. 0430946
…4-file-error-message
…with Export Type UI magento#109
…ect constructor. It caused … magento#16596
# Conflicts: # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsPagesPageActionsSection.xml # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreData.xml # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreGroupData.xml # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreViewActionsSection.xml # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteActionsSection.xml # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoreGroupActionsSection.xml
…y for Multi-store -Updated static noNameSpaceSchema Location respectively to match new location
…error-message [borg] MAGETWO-77744: [Magento Cloud] - Error message when uploading unsupported file format
[earl] MAGETWO-91606: Upgrade to 2.2.2 and above took long time
- merged latest code from mainline branch
Accepted Public Pull Requests: - magento#16909: Stabilize Travis CI integration tests suite (by @ishakhsuvarov) - magento#16879: [Port 2.3] Captcha: Added unit test for CheckGuestCheckoutObserver (by @rogyar) - magento#16820: Add missing false-check to the ConfiguredRegularPrice price-model (by @ronak2ram) - magento/graphql-ce#101: Additional checks for fragments added in category tree (by @rogyar) - magento/graphql-ce#102: Fix the category tree depth calculation bug (by @dmytro-ch) - magento/graphql-ce#119: GraphQL-116: Wrong category table name resolving (by @naydav) - magento#16603: [Forwardport] Fix error in payment void method (by @gelanivishal) - magento-engcom/import-export-improvements#109: magento-engcom/import-export-improvements#64: fix issue with Export Type UI (by @dmanners) - magento#16596: [Forwardport] Incorrect value NULL was passed to DataObject constructor. It caused � (by @gelanivishal) - magento#16518: [Forwardport] Use constant time string comparison in FormKey validator (by @gelanivishal) Fixed GitHub Issues: - magento#100: Oracle and Other RDBMS Status? (reported by @dicgf8) has been fixed in magento/graphql-ce#102 by @dmytro-ch in 2.3-develop branch Related commits: 1. 9116d82 - magento#116: EE vs CE (reported by @gondo) has been fixed in magento/graphql-ce#119 by @naydav in 2.3-develop branch Related commits: 1. 4a4bbe2 - magento#16184: Argument 1 passed to Magento\Sales\Model\Order\Payment must be an instance of Magento\Framework\DataObject, none given (reported by @Jakhotiya) has been fixed in magento#16603 by @gelanivishal in 2.3-develop branch Related commits: 1. a1f5fa5
Fixed issues: - MAGETWO-88432: Filesystem Directory Improvement
[borg] MAGETWO-91528: Customizable options truncated when displaying ordered product in admin
[earl] MAGETWO-67627: CMS Page does not save when same url key with hierarchy for Multi-store
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Original Pull Request
magento#16646
Description
Corrected block name in Magento_Framework's test XML file. block name was written wrong in grou.xml file.
Fixed Issues (if relevant)
N/A
Manual testing scenarios
N/A
Contribution checklist