Merge 1.7.4.2 into develop #9386
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
… and finish after the current day
add combinations in cart summary
…cess-file-to-var Added .htaccess to var folder
Fix have cart rule today
…edia-server-urls-1.7 Fixed bug with friendly URLs and Media Servers
Update ps_themecusto to version 1.0.6
…alog-modules Update Controller name for link generation to modules catalog
Apache 2.4 configuration
Ability to use widget block from specific hook
….0.0 Limit subquery results in upgrade sql 1.7.0.0
…-from-tests Fix/remove mbo from tests
Core.js typeerror after updatecart
…ional IN: Set allow_url_fopen optional in the system step
After add to cart there was JS error in console which was blocking refresh of product page
After add to cart there was JS error in console which was blocking refresh of product page
Wrong generated template path when using getCurrentSubTemplate with a full path name.
Fix JS error after add to cart
…tion-in-install ntree regeneration should be done also if the entity arg is empty during install
fix multishop price calculation
Generate core.js
Add some fixes to the script and update scenario of onbording
prestonBot
added
develop
PierreRambaud
approved these changes
Jul 27, 2018
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.
This change is