Update 2.2 develop branch #1
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
Added calendar initializaton for Conditional Rules when a rule is created for the 1st time
…inline with klarna_core_order order_id and amazon_sales_order amazon_order_reference_id. Limit was 32 characters where as a klarna_order reference is 36 characters at present.
Update module logic when customer have store_id = 0
Fix unit tests according to new logic Add integration tests for case when customer have store_id = 0
…for-admin-required-fields
(cherry picked from commit 388fb45)
(cherry picked from commit 21f5225)
2.2 develop-update
- fix php7.0 compatibility
…ot preventing from saving - Restricted user to change date input value - Open datepicker popup once user click on the date to be changed
- take into account into "null" locale value
Moved to upgrade schema and bumped module version
…ling and shipping address are the same" is unchecked
…ot preventing from saving - Added autocomplete option for calendar.js
2.2 develop-update branch
…e into 2.2-develop-prs
Back-port #19024 from 2.3 to 2.2
Accepted Public Pull Requests: - #19355: [Backport] Changed get product way in blocks with related products (by @gelanivishal) - #19357: [Backport] #13157 - Last Ordered Items block - bad js code (by @gelanivishal) - #19296: Fix issue 19286 - Wrong pager style (by @speedy008) - #18621: 18615 updates structure for last_trans_id to be varchar 255 which is � (by @iancassidyweb) - #14485: Fix for Issue #4136, MAGETWO-53440 (by @vasilii-b) - #18905: Fix the issue with missing asterisk for admin required fields (by @dmytro-ch) Fixed GitHub Issues: - #13157: Last Ordered Items block - bad js code (reported by @Eytham) has been fixed in #19357 by @gelanivishal in 2.2-develop branch Related commits: 1. 7559e3e 2. 58550b9 3. f1bb98e - #19286: Wrong pager style (reported by @gujjwal00) has been fixed in #19296 by @speedy008 in 2.2-develop branch Related commits: 1. 301d73d 2. 7c013a1 3. 584242c 4. ee0bae8 - #18615: Field restriction incompatibilities between klarna_core_order and sales_order_payment last_trans_id (reported by @iancassidyweb) has been fixed in #18621 by @iancassidyweb in 2.2-develop branch Related commits: 1. 172ecf6 2. 3590785 3. 6d33140 4. dd753a1 - #4136: Widget condition with unexpected character not preventing from saving (reported by @devhn) has been fixed in #14485 by @vasilii-b in 2.2-develop branch Related commits: 1. cc1e013 2. ff4b005 3. 6c87bb3 4. 1d1d061 - #18904: Missing asterisk for admin required fields (reported by @dmytro-ch) has been fixed in #18905 by @dmytro-ch in 2.2-develop branch Related commits: 1. 38bfe66 2. 7d2dd65 3. 4f07c61
… order items table #19358
…me does not inherit translations from parent theme #19023
Accepted Public Pull Requests: - #19365: Fixing a test for Magento Newsletter. (by @tiagosampaio) - #19358: [Backport] Fix the issue with repetitive "tbody" tag for order items table (by @gelanivishal) - #19023: [2.2 develop] [backport #19018] [issue #17833] child theme does not inherit translations from parent theme (by @vpodorozh) Fixed GitHub Issues: - #17833: Child theme does not inherit translations from parent theme (reported by @rossmc) has been fixed in #19023 by @vpodorozh in 2.2-develop branch Related commits: 1. caa2fe8 2. 24330d6 3. 10d9cc9 4. a3db8d3 5. 26ea51e 6. e8a07c9
…ndex to 0 when tabs are … #19364
…con small cut from right side #19356
…edirecting images by default csv import #18899
[TSG-CSL3] For 2.2 (pr11)
- merged latest code from mainline branch
Accepted Public Pull Requests: - #19374: back-port-pull-19024 (by @agorbulin) - #19364: [Backport] fix: remove old code in tabs, always set tabindex to 0 when tabs are � (by @DanielRuf) - #19356: [Backport] Magento backend Notifications counter round icon small cut from right side (by @gelanivishal) - #18899: [Backport] fixed - can't import external http to https redirecting images by default csv import (by @rahulwebkul) Fixed GitHub Issues: - #18887: Magento backend Notifications counter round icon small cut from right side (reported by @abrarpathan19) has been fixed in #19356 by @gelanivishal in 2.2-develop branch Related commits: 1. 132a754 2. 91fc40c - #18839: can't import external http to https redirecting images by default csv import (reported by @ankit-sf) has been fixed in #18899 by @rahulwebkul in 2.2-develop branch Related commits: 1. 3a88a38
…nto MAGETWO-91070
[tango] MAGETWO-91070: Missing Swatch Images Break Catalog Pages
ansari-ziyaurrahman
pushed a commit
that referenced
this pull request
Apr 18, 2019
merge from magento/magento2
ansari-ziyaurrahman
pushed a commit
that referenced
this pull request
Apr 18, 2019
Removed two times zlib.output_compression on
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.
No description provided.