Skip to content

[Backport] magento/magento2#12250: View.xml is inheriting image sizes from paren… #2

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

Closed
wants to merge 1,294 commits into from

Conversation

quisse
Copy link
Owner

@quisse quisse commented Aug 8, 2018

Original Pull Request

magento#14537
View.xml is inheriting image sizes from parent (so an optional field is replaced by the value of parent)

  • Made media attributes nullable and parse them correct

Description

Fixed Issues (if relevant)

  1. View.xml is inheriting image sizes from parent (so an optional field is replaced by the value of parent) magento/magento2#12250: View.xml is inheriting image sizes from parent (so an optional field is replaced by the value of parent)

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

p-bystritsky and others added 30 commits July 19, 2018 15:59
 - Merge Pull Request magento#16948 from ronak2ram/magento2:2.1-develop-PR-port-11368
 - Merged commits:
   1. 082aea7
   2. 94452f7
   3. a854267
 - Merge Pull Request magento#16945 from ihor-sviziev/magento2:2.1-develop-PR-port-13468
 - Merged commits:
   1. 045b95c
Accepted Public Pull Requests:
 - magento#16923: [Backport] Fix docBlock for hasInvoices(), hasShipments(), hasCreditmemos() (by @eduard13)
 - magento#16917: [Backport] Issue 5316 (by @ronak2ram)


Fixed GitHub Issues:
 - magento#5316: [2.1.0] HTML minification problem with php tag with a comment and no space at the end (reported by @hostep) has been fixed in magento#16917 by @ronak2ram in 2.1-develop branch
   Related commits:
     1. 28ef78d
     2. 433a9c3
Fixed issues:
 - MAGETWO-93205: [2.1] Cron Schedule table is growing so fast
 - merged latest code from mainline branch
Fixed issues:
- MAGETWO-93265: Change the depth of a recursive check of directory write permissions
 - merged latest code from mainline branch
…nto#16986

 - Merge Pull Request magento#16986 from gelanivishal/magento2:2.1-develop-PR-port-16595
 - Merged commits:
   1. 2e4bcf1
Accepted Public Pull Requests:
 - magento#16945: [Backport] Fix Sort by Product Name (by @ihor-sviziev)
 - magento#16948: [Backport] Fix meta title property (by @ronak2ram)
 - magento#16920: [Backport] Admin tabs order not working properly (by @mage2pratik)


Fixed GitHub Issues:
 - magento#12860: Sort by Product Name doesn't work with Ancor and available filters (reported by @ihor-sviziev) has been fixed in magento#16945 by @ihor-sviziev in 2.1-develop branch
   Related commits:
     1. 045b95c

 - magento#2956: Unable to render page when 'meta title' page config param is set (reported by @volnnn) has been fixed in magento#16948 by @ronak2ram in 2.1-develop branch
   Related commits:
     1. 082aea7
     2. 94452f7
     3. a854267

 - magento#16174: Admin tabs order not working properly (reported by @tiagosampaio) has been fixed in magento#16920 by @mage2pratik in 2.1-develop branch
   Related commits:
     1. fb93d25
     2. ff94075
     3. 9c7687a
     4. 1aec473
     5. 4ac09bf
     6. 787ab8b
     7. 6ca22c5
Accepted Public Pull Requests:
 - magento#16986: [Backport] Trim issue on customer confirmation form (by @gelanivishal)


Fixed GitHub Issues:
 - magento#6058: IE11 user login email validation fails if field has leading or trailing space (reported by @dnadle) has been fixed in magento#16986 by @gelanivishal in 2.1-develop branch
   Related commits:
     1. 2e4bcf1
…t page. magento#16992

 - Merge Pull Request magento#16992 from chirag-wagento/magento2:2.1-develop-PR-port-15422
 - Merged commits:
   1. 846347d
Stanislav Idolov and others added 25 commits August 1, 2018 16:26
Accepted Public Pull Requests:
 - magento#17192: [Backport] Filter test result collection with the cron job code defined in the c� (by @gelanivishal)
 - magento#17172: Declare module namespace before template path name (by @mage2pratik)
 - magento#17253: [Backport] fix: change "My Dashboard" to "My Account", fixes magento#16007 (by @gelanivishal)


Fixed GitHub Issues:
 - magento#16243: Integration test ProcessCronQueueObserverTest.php succeeds regardless of magento config fixture (reported by @evktalo) has been fixed in magento#17192 by @gelanivishal in 2.1-develop branch
   Related commits:
     1. 1ed15d2
…agento#16619

 - Merge Pull Request magento#16619 from ronak2ram/magento2:ronak2ram-patch-1
 - Merged commits:
   1. 335bca4
Accepted Public Pull Requests:
 - magento#16619: [Backport] Login with wishlist raise report after logout (by @ronak2ram)
 - magento#17179: [Backport] Fix newsletter subscription behaviour for registered customer.  (by @mage2pratik)
 - magento#16911: [Backport] Fixed extends and removed unnecessary variables (by @gelanivishal)
 - Merge Pull Request magento#17335 from DanielRuf/magento2:fix/remove-unused-id-2-1
 - Merged commits:
   1. 2ddec42
…y validator magento#17108

 - Merge Pull Request magento#17108 from gelanivishal/magento2:2.1-develop-PR-port-13509
 - Merged commits:
   1. 727503d
   2. 38e2133
   3. 4148751
Accepted Public Pull Requests:
 - magento#17335: fix: remove unused ID (by @DanielRuf)
removed extraneous margin and compensated padding and set both to 0, which creates the same effect
…to#17379

 - Merge Pull Request magento#17379 from gelanivishal/magento2:2.1-develop-PR-port-15936
 - Merged commits:
   1. ebdc7c3
…r account page after redirect for force password change magento#17091

 - Merge Pull Request magento#17091 from mageprince/magento2:2.1-develop-PR-port-13787
 - Merged commits:
   1. 90a8bed
Accepted Public Pull Requests:
 - magento#17379: [Backport] magento#15308 removed extraneous margin (by @gelanivishal)
 - magento#17108: [Backport] Use constant time string comparison in FormKey validator (by @gelanivishal)


Fixed GitHub Issues:
 - magento#15308: extraneous margins on product list and product list items (reported by @DanielRuf) has been fixed in magento#17379 by @gelanivishal in 2.1-develop branch
   Related commits:
     1. ebdc7c3
…r account page after redirect for force password change magento#17091
Accepted Public Pull Requests:
 - magento#17091: [Backport] Issue-13768 Fixed error messages on admin user account page after redirect for force password change (by @mageprince)
 - magento#15677: [Backport] Wrong Last orders amount on dashboard magento#15660 (by @ankurvr)


Fixed GitHub Issues:
 - magento#13768: Expired backend password - Attention: Something went wrong (reported by @janssensjelle) has been fixed in magento#17091 by @mageprince in 2.1-develop branch
   Related commits:
     1. 90a8bed

 - magento#15660: Wrong order amount on dashboard on Last orders listing when having more than one website with different currencies (reported by @ankurvr) has been fixed in magento#15677 by @ankurvr in 2.1-develop branch
   Related commits:
     1. 5a379fc
     2. 0deea0e
     3. 6b0f8d0
     4. 2594853
quisse pushed a commit that referenced this pull request Aug 8, 2018
quisse pushed a commit that referenced this pull request Aug 8, 2018
… Collection Using Magent… #2 magento#15829

 - Merge Pull Request magento#15829 from neeta-wagento/magento2:2.1-develop-PR-port-11869
 - Merged commits:
   1. c261156
   2. 950e317
quisse pushed a commit that referenced this pull request Aug 8, 2018
quisse pushed a commit that referenced this pull request Aug 8, 2018
Accepted Public Pull Requests:
 - magento#15829: [Backport] Resolve Error While Trying To Load Quote Item Collection Using Magent� #2 (by @neeta-wagento)
 - magento#15834: [BackPort] Resolve Knockout non-unique elements id in console error (by @viral-wagento)


Fixed GitHub Issues:
 - magento#8954: Error While Trying To Load Quote Item Collection Using Magento\Quote\Model\ResourceModel\QuoteItem\Collection::getItems() (reported by @rendyep) has been fixed in magento#15829 by @neeta-wagento in 2.1-develop branch
   Related commits:
     1. c261156
     2. 950e317

 - magento#15348: Multiple Payment Methods Enabled is giving error in console "Found 3 Elements with non - unique Id" (reported by @neeta-wagento) has been fixed in magento#15834 by @viral-wagento in 2.1-develop branch
   Related commits:
     1. b63d2c5
@quisse quisse closed this Aug 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.