Skip to content

Conversation

@jonshipman
Copy link
Owner

Fixes a JS problem with Condition Category Chooser Crashes Page if Store has Several Nested Categories

igrybkov and others added 30 commits May 3, 2018 15:35
Fixed issues:
  - MAGETWO-87731: An error happens when you have a new Critical Admin Notification and Release Notification window is opened
# Conflicts:
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AddProductToCartActionGroup.xml
 - merged latest code from mainline branch
Accepted Public Pull Requests:
 - #14923: Move customer.account.dashboard.info.extra block to contact information (by @JeroenVanLeusden)
 - #14939: Renamed "Add Block Names to Hints" config setting to represent what it actually does (by @chris-pook)
 - #14874: Fix infinite checkout loader when some script wasn't loaded correctly because of network error (by @vovayatsyuk)
Accepted Public Pull Requests:
 - #14963: Fixed Overlay Problems (by @ArtiDjeims)
 - #14935: Change 'Update'-button visibility on change qty event. (by @likemusic)
duhon and others added 29 commits May 15, 2018 20:13
[performance] MAGETWO-69847: Static Assets deployment throws errors when redis is used for cache
 - merged latest code from mainline branch
Accepted Public Pull Requests:
 - #13185: Fix negative basket total due to shipping tax residue (by @torreytsui)
 - #12324: Simplified \Magento\Framework\Reflection\TypeProcessor (by @joni-jones)
 - Merge Pull Request #15194 from jissereitsma/magento2:issue-form-button-provider
 - Merged commits:
   1. 85a47d9
   2. 0dee82a
   3. baa36da
   4. 196ee86
   5. 130223e
   6. 99ee323
 - Merge Pull Request #15249 from Yogeshks/magento2:2.2-develop
 - Merged commits:
   1. b4bf23d
   2. 80a4fd2
Method name \Magento\Framework\App\Request\Http::removeRepitedSlashes contained typo
 - Merge Pull Request #15256 from olmer/magento2:2.2-develop
 - Merged commits:
   1. d259820
Fix class variable phpdoc comment
Remove deprecated private method getSerializer, injected in constructor instead
… class #15262

 - Merge Pull Request #15262 from adrian-martinez-interactiv4/magento2:FR22#FIX-NOTIFICATION-STORAGE
 - Merged commits:
   1. 0921243
Accepted Public Pull Requests:
 - #15202: [Backport 2.2] Fix for displaying a negative price for a custom option.  (by @dverkade)
 - #15197: Fix Magento_ImportExport not supporting unicode characters in column names (by @tdgroot)
 - #15172: 7399-clickableOverlay-less-fix - added pointer-events rule to .modal-� (by @virtua-pmakowski)
 - #15178: Removed mageMenu widget dependency from breadcrumbs component (by @vovayatsyuk)
 - #14614: Add Parent Item to order item in repository (by @JeroenVanLeusden)


Fixed GitHub Issues:
 - #7399: Modal UI: clickableOverlay option doesn't work (reported by @thdoan) has been fixed in #15172 by @virtua-pmakowski in 2.2-develop branch
   Related commits:
     1. abe727a

 - #14987: Invisible breadcrumbs at product page when mageMenu widget is not used (reported by @vovayatsyuk) has been fixed in #15178 by @vovayatsyuk in 2.2-develop branch
   Related commits:
     1. 34a871b
     2. 1bcf41c
Accepted Public Pull Requests:
 - #15256: Fixed typo in method name (by @olmer)
 - #15137: fix: do not forcefully set area in template if it is already set, fixes #14968, fixes #13530 (by @DanielRuf)


Fixed GitHub Issues:
 - #13530: "Template file 'header.html' is not found" error while trying to save Design Configuration. (reported by @hostep) has been fixed in #15137 by @DanielRuf in 2.2-develop branch
   Related commits:
     1. 0ae1230
     2. 3df51d4
     3. 0dec988
     4. d92b679

 - #14968: Can't change the applied theme in 2.2.4 (reported by @Krapulat) has been fixed in #15137 by @DanielRuf in 2.2-develop branch
   Related commits:
     1. 0ae1230
     2. 3df51d4
     3. 0dec988
     4. d92b679
…magento-magento2-14994

# Conflicts:
#	dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js
[performance] MAGETWO-86143: Disable statistic collecting for Reports module
Accepted Public Pull Requests:
 - #15262: Fix \Magento\Customer\Model\Customer\NotificationStorage class (by @adrian-martinez-interactiv4)
 - #15249: Removed non-existing argument (by @yogeshks)
 - #15194: Move buttons definition to separate file (by @jissereitsma)
 - #14994: Prevent not category links in breadcrumbs at product page (by @vovayatsyuk)
@jonshipman jonshipman merged commit 1f3aedd into jonshipman:2.2-develop May 18, 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.