Skip to content
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

Merge from fork #1

Merged
merged 7,387 commits into from
Sep 22, 2016
Merged

Merge from fork #1

merged 7,387 commits into from
Sep 22, 2016

Conversation

PascalBrouwers
Copy link
Owner

No description provided.

mslabko and others added 30 commits September 6, 2016 18:51
- MAGETWO-57913: Mysql connections is lost if forked process
[EAST] MAGETWO-57726 [GitHub] Exception is created but not thrown #6320
[Jackalopes] MAGETWO-56339, MAGETWO-57231, MAGETWO-55775
…x - 2.2

- Restore testsuite rule upgrade.xml
…d separator in the Admin Panel #5745

  - Remove suppress
…block request for available shipping solution
- MAGETWO-57913: Mysql connections is lost if forked process
…x - 2.2

- Restore testsuite rule upgrade.xml
[Folks] Bug Fixing
Fixes:
- Select box shown per page in customer's my account pages is not visible
- JS validation errors are displayed not per option groups for Product with custom options on create Order Admin page
- JS validation is absent if Merchant does not specify Shipping Method while creating Order in Admin
- Wrong initialization sequence in mage.priceBox widget
-  Issues with minicart in multiwebsite
- Selected category is not added to Cart Price Rule condition due to JS error
- Coupon code override cart rules with no coupon code
Denys Rul and others added 25 commits September 19, 2016 15:57
Bugs
MAGETWO-56915 Versioning of static files (CSS, JS, Fonts, Images, etc.) doesn't enabled by default - for mainline
MAGETWO-58367 Pattern in elements.xsd is too strict [GITHUB PR#6283]
MAGETWO-58371 Use inline elements for inline links [GITHUB PR#1988]
…gives a 500 error

Merge remote-tracking branch 'mainline/develop' into MAGETWO-56063-upgrade-from-2.0.7-to-2.1.0
…-from-2.0.7-to-2.1.0

[Jackalopes] MAGETWO-56063 upgrade from 2.0.7 to 2.1.0 (2.2 release)
Bugs
MAGETWO-55594 Urgent - Opening product in Admin is very slow
Bug
MAGETWO-56699 [GITHUB] Paypal checkout not possible with products that have custom options #5938 - for mainline
MAGETWO-58290 [Github]Empty product option is added on each PUT request #5963
MAGETWO-58136 [Github] Shipping and billing address are not set if order placed with payment action Sale #6438
MAGETWO-55608 [GITHUB] M2.1: Not scrollable picture on mobile / product page #5302
MAGETWO-58285 Ajax error message doesn't display in backend
MAGETWO-58338 [Github]Problem adding attribute options that start with a number via REST Api #5715
MAGETWO-52575 Unable to apply free shipping to specified method when creating order in admin
MAGETWO-57078 [GITHUB] Can't set customer group when creating a new order in the admin. #6162
MAGETWO-58039 Table rate shipping not applying correctly - for mainline
- support user defined "_mode" parameter
- add integration test
…-return-nonzero-on-failure

[Jackalopes] Magetwo 52837 command return nonzero on failure (2.2 release)
Bug 
MAGETWO-58373 Set return code for SetModeCommand [GITHUB PR#4845]
MAGETWO-58372 Added 'target' attribute to the allowed attributes array for link block [GITHUB PR#1935]
MAGETWO-56552 [GITHUB PR#4733] Escape Js Quote for layout updates
MAGETWO-58369 [GITHUB PR#4733] Update Container.php [GITHUB PR#4565]
@PascalBrouwers PascalBrouwers merged commit 617756a into PascalBrouwers:develop Sep 22, 2016
PascalBrouwers pushed a commit that referenced this pull request Feb 3, 2017
Fixing bad date format on sales_order grid
PascalBrouwers pushed a commit that referenced this pull request Dec 1, 2017
PascalBrouwers pushed a commit that referenced this pull request Jan 24, 2020
PascalBrouwers pushed a commit that referenced this pull request Jan 24, 2020
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.