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

2.2 develop #2

Merged
merged 530 commits into from
Oct 16, 2018
Merged

2.2 develop #2

merged 530 commits into from
Oct 16, 2018

Conversation

janakbhimani
Copy link
Owner

Description

Fixed Issues (if relevant)

  1. magento/magento2#<issue_number>: Issue title
  2. ...

Manual testing scenarios

  1. ...
  2. ...

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)

 - Merge Pull Request #18175 from magently/magento2:fix/catalog-rule-categories-selection
 - Merged commits:
   1. 9f19592
…18280

 - Merge Pull Request #18280 from dmytro-ch/magento2:2.2-develop-PR-port-18117
 - Merged commits:
   1. 484bbba
   2. dd9b294
… chars #18215

 - Merge Pull Request #18215 from adammada/magento2:wysiwyg-fix
 - Merged commits:
   1. 4e62fe3
   2. bf2efff
The bug caused issues during the export of analytics data from advanced
reporting. The scandir has parameter were the sort can be placed, but
using UNSORTED gives you unwanted lists of files/dirs. Therefor deleting
the first 2 via array_shift, is not a proper way of dealing with this

Signed-off-by: Harold Claus <harold.claus@studioemma.com>
 - Merge Pull Request #18086 from sreichel/magento2:develop/fix-getStoreId
 - Merged commits:
   1. 9d8b04a
 - Merge Pull Request #18166 from magently/magento2:fix/extended-zip-code-in-table-rates
 - Merged commits:
   1. 6e4a4b2
Accepted Public Pull Requests:
 - #18215: fix wysiwyg editor not decoding base64 filenames special chars (by @adammada)
 - #18280: [Backport] Change sort order for customer group options (by @dmytro-ch)
 - #18086: Cast products "getStoreId()" to int, closes #18079 (by @sreichel)
 - #16885: [Fix] Do not modify current list of countries with require states during setup upgrade (by @jalogut)


Fixed GitHub Issues:
 - #18138: WYSIWYG editor fails to parse directives of files with special characters in URL (so random files) (reported by @adammada) has been fixed in #18215 by @adammada in 2.2-develop branch
   Related commits:
     1. 4e62fe3
     2. bf2efff

 - #18101: Wrong sort order for customer groups in customer grid filter (reported by @sreichel) has been fixed in #18280 by @dmytro-ch in 2.2-develop branch
   Related commits:
     1. 484bbba
     2. dd9b294

 - #18079: Inconsistent return type for getStoreId() (reported by @sreichel) has been fixed in #18086 by @sreichel in 2.2-develop branch
   Related commits:
     1. 9d8b04a
ArtsiomBruneuski and others added 19 commits October 12, 2018 16:05
…in shopping cart #18552

 - Merge Pull Request #18552 from gelanivishal/magento2:2.2-develop-PR-port-18481
 - Merged commits:
   1. db4ac89
…ng validate scheme #18554

 - Merge Pull Request #18554 from gelanivishal/magento2:2.2-develop-PR-port-18416
 - Merged commits:
   1. 3109909
   2. 9afdfee
   3. 791609c
   4. beeecaf
   5. 7e38326
   6. a20968d
   7. 2f2cafe
   8. 72b31c9
   9. a7cdae0
   10. 74c6bfd
 - Merge Pull Request #18556 from gelanivishal/magento2:2.2-develop-PR-port-18505
 - Merged commits:
   1. aedb6c9
…n if attribute is required #18564

 - Merge Pull Request #18564 from gelanivishal/magento2:2.2-develop-PR-port-18221
 - Merged commits:
   1. ba9a1b2
… Unit Test #18559

 - Merge Pull Request #18559 from gelanivishal/magento2:2.2-develop-PR-port-18490
 - Merged commits:
   1. a2b69ed
Accepted Public Pull Requests:
 - #18196: Fix for custom product attribute changing 'backend_type' when 'is_user_defined = 1' and get updated/saved in Admin Backend (by @bartoszkubicki)
 - #17968: Fix Customer custom attributes lost after save (by @Thundar)


Fixed GitHub Issues:
 - #9219: Custom Product Attribute changes 'backend_type' when 'is_user_defined = 1' and get updated/saved in Admin Backend (reported by @mhauri) has been fixed in #18196 by @bartoszkubicki in 2.2-develop branch
   Related commits:
     1. f6a9459

 - #12479: Saving Customer Model directly causes loss of data (reported by @Danielc3) has been fixed in #17968 by @Thundar in 2.2-develop branch
   Related commits:
     1. 7965c9b
     2. 44fe03f
     3. 6a098a7
Accepted Public Pull Requests:
 - #18559: [Backport] Covering the AssignOrderToCustomerObserver by Unit Test (by @gelanivishal)
 - #18564: [Backport] Empty option Label should always be blank even if attribute is required (by @gelanivishal)
 - #18556: [Backport] Fixed typo from filed to field (by @gelanivishal)
 - #18554: [Backport] throw exception InvalidArgumentException during validate scheme (by @gelanivishal)
 - #18552: [Backport] Added validation on maximum quantity allowed in shopping cart (by @gelanivishal)
 - #18495: [Backport] Checkout - Fix "Cannot read property 'code' on undefined" issue (by @ihor-sviziev)


Fixed GitHub Issues:
 - #14555: Communication's component validator does not propagate exceptions, obscuring the cause of the error (reported by @nikita2206) has been fixed in #18554 by @gelanivishal in 2.2-develop branch
   Related commits:
     1. 3109909
     2. 9afdfee
     3. 791609c
     4. beeecaf
     5. 7e38326
     6. a20968d
     7. 2f2cafe
     8. 72b31c9
     9. a7cdae0
     10. 74c6bfd

 - #18477: Set maximum Qty Allowed in Shopping Cart is 0 still allow adding to cart (reported by @duongdiep212) has been fixed in #18552 by @gelanivishal in 2.2-develop branch
   Related commits:
     1. db4ac89

 - #18164: Checkout - Cannot read property 'code' of undefined (reported by @bruno-serfe) has been fixed in #18495 by @ihor-sviziev in 2.2-develop branch
   Related commits:
     1. e7f70ab
     2. 25e3cfe
@janakbhimani janakbhimani merged commit 8c868c3 into janakbhimani:2.2-develop Oct 16, 2018
janakbhimani pushed a commit that referenced this pull request Oct 16, 2018
janakbhimani pushed a commit that referenced this pull request Oct 25, 2018
janakbhimani pushed a commit that referenced this pull request Nov 24, 2018
janakbhimani pushed a commit that referenced this pull request Nov 24, 2018
janakbhimani pushed a commit that referenced this pull request Nov 24, 2018
janakbhimani pushed a commit that referenced this pull request Nov 24, 2018
janakbhimani pushed a commit that referenced this pull request Dec 15, 2018
janakbhimani pushed a commit that referenced this pull request Dec 15, 2018
janakbhimani pushed a commit that referenced this pull request Dec 15, 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.