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.

Sign up for GitHub

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

Jump to bottom

MSI: Merge mainline #80

Merged
merged 286 commits into from
Sep 4, 2017
Merged

MSI: Merge mainline #80

merged 286 commits into from
Sep 4, 2017

Conversation

naydav
Copy link

@naydav naydav commented Sep 4, 2017

No description provided.

Stanislav Idolov and others added 30 commits August 10, 2017 12:02
MAGETWO-71242: Indexation error on medium profile
084419b
@omiroshnichenko
Merge branch 'MAGETWO-71242' of github.com:magento-plankton/magento2c…
bdbbda4 
…e into 2.2-bugs
@omiroshnichenko
MAGETWO-71373: Cannot Install Magento without Some Modules
f5769cf
@andimov
MAGETWO-71434: Generated pages with "html" extension are not cached b…
fe6fb3b 
…y Varnish
MAGETWO-70571: There is no possibility to activate DEBUG logging in p…
8f574b8 
…roduction mode

- fixed failed L1 & static tests for failed L3
Merge remote-tracking branch 'origin/2.2-develop' into PR_09_08
b755e6f
Merge remote-tracking branch 'main/2.2-develop' into PR_09_08
713eeff
MAGETWO-70571: There is no possibility to activate DEBUG logging in p…
4834f46 
…roduction mode

- fixed failed L4
@irenelagno
MAGETWO-71385: Remove Deprecated AroundProductRepositorySave Plugin
869b246
@irenelagno
Merge branch 'main_2.2-develop' into MAGETWO-71385
b905163
@fascinosum
MAGETWO-69559: Declaration of dependencies for indexers
4dca8e6
MAGETWO-71257: Need to disable module output
348d513
MAGETWO-71257: Need to disable module output by configuration
366b3ad
MAGETWO-71257: Need to disable module output
980159b
MAGETWO-71257: Need to disable module output by configuration
bd65ca4
MAGETWO-71257: Need to disable module output by configuration
15eeba8
MAGETWO-71257: Need to disable module output by configuration
5d1c9a2
MAGETWO-71257: Need to disable module output by configuration
ff4840e
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-71349
0ae5451
@omiroshnichenko
Merge branch '2.2-develop' of github.com:magento/magento2ce into 2.2-…
e175e2f 
…bugs
@RomaKis
Merge branch '2.2-develop' into MAGETWO-60470
3a4c045 
# Conflicts:
#	dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
@RomaKis
MAGETWO-60470: [Import Custom options] An error occurs on attempt to …
8f0ff8e 
…save the product with imported options
@andimov
MAGETWO-71434: Generated pages with "html" extension are not cached b…
61fee9b 
…y Varnish
@fascinosum
MAGETWO-69559: Declaration of dependencies for indexers
55b31fc
@fascinosum
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-69559
9956861
MAGETWO-70571: There is no possibility to activate DEBUG logging in p…
05fefed 
…roduction mode

- fixed backward compatibility for failed Semantic Version Checker
@le0n4eg
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-71431
e413234
@mslabko
MAGETWO-68787: [PAT] Gather more metrics
87b1749
Merge remote-tracking branch 'main/2.2-develop' into PR_09_08
92af1a8
MAGETWO-70571: There is no possibility to activate DEBUG logging in p…
1e4a1e2 
…roduction mode

- fixed backward compatibility for failed Semantic Version Checker
Oleksii Korshenko and others added 27 commits August 29, 2017 09:56
Merge pull request #1441 from magento-engcom/develop-prs
b9d696e 
Public Pull Requests

magento/magento2#10670
@ishakhsuvarov
MAGETWO-71697: Fix possible bug when saving address with empty street…
904a13c 
… line #10582

 - Merge Pull Request magento/magento2#10582 from vovayatsyuk/magento2:fix-address-empty-street-array
 - Merged commits:
   1. 5d5cb9d
   2. 77a45a8
   3. 7ac1872
   4. 6200e69
   5. ce0b86b
@ishakhsuvarov
MAGETWO-72126: Disabling of randomly failing and timing out Functiona…
1f08983 
…l Tests
@ishakhsuvarov
MAGETWO-71697: Merge branch 'develop' of github.com:magento/magento2 …
3d2f8e4 
…into MAGETWO-71697-PR-10582
@dverkade
- Fixed spelling mistake, changed function isClassLoadableFromDisc to…
827f052 
… isClassLoadabkelFromDisk

- Fowarded old function to the new function so that it's fully backward compatible.
- Deprecated old function with spelling mistake
MAGETWO-72147: Fix spelling mistake in the code generator #10718
18bd50d 
 - Merge Pull Request magento/magento2#10718 from dverkade/magento2:Fix_code_generator_spelling_mistake
 - Merged commits:
   1. 827f052
MAGETWO-72147: Fix spelling mistake in the code generator #10718
fe15e3e
Merge remote-tracking branch 'origin/MAGETWO-72126' into develop-prs
c436898
MAGETWO-71954: Expanded ReadInterface #10672
d490d5c
Merge pull request #1444 from magento-engcom/develop-prs
2808f2d 
Public Pull Requests:

magento/magento2#10718
magento/magento2#10672
@ishakhsuvarov
magento/magento2#10563: Merge branch 'develop' of github.com:magento/…
d621424 
…magento2 into ulftietze-develop
@ishakhsuvarov
magento/magento2#10563: Modified Bundle.js because of breaking Encodi…
88267a4 
…ng in Production Mode.
@ishakhsuvarov
MAGETWO-71647: Modified Bundle.js because of breaking Encoding in Pro…
ee97dcb 
…duction Mode. #10563

 - Merge Pull Request magento/magento2#10563 from ulftietze/magento2:develop
 - Merged commits:
   1. 9735376
   2. d621424
   3. 88267a4
@vovayatsyuk
Added ability to set 'rows' property for wysiwyg elements.
2b07823 
Usage example:

```
<item name="config" xsi:type="array">
    <item name="formElement" xsi:type="string">wysiwyg</item>
    <item name="wysiwyg" xsi:type="boolean">true</item>
    <item name="rows" xsi:type="number">10</item>
</item>
```
@ishakhsuvarov
MAGETWO-72192: Added ability to set 'rows' property for wysiwyg eleme…
d2a29a4 
…nts. #10732

 - Merge Pull Request magento/magento2#10732 from vovayatsyuk/magento2:fix-wysiwyg-rows-config
 - Merged commits:
   1. 2b07823
@ishakhsuvarov
MAGETWO-72192: Added ability to set 'rows' property for wysiwyg eleme…
67a378e 
…nts. #10732
@ishakhsuvarov
MAGETWO-71697: Fix possible bug when saving address with empty street…
5858ca5 
… line #10582
@ishakhsuvarov
MAGETWO-71647: Modified Bundle.js because of breaking Encoding in Pro…
03d99c5 
…duction Mode. #10563
@ishakhsuvarov
MAGETWO-72126: Disabling of randomly failing and timing out Functiona…
f291ca3 
…l Tests
@ishakhsuvarov
MAGETWO-72126: Merge branch 'MAGETWO-72126' of github.com:magento-eng…
26369d8 
…com/magento2ce into develop-prs
@ishakhsuvarov
Merge pull request #1448 from magento-engcom/develop-prs
6f25236 
[EngCom] Public Pull Requests
 - MAGETWO-72192 Added ability to set 'rows' property for wysiwyg elements. magento/magento2#10732
 - MAGETWO-71697 Fix possible bug when saving address with empty street line magento/magento2#10582
 - MAGETWO-71647 Modified Bundle.js because of breaking Encoding in Production Mode. magento/magento2#10563
 - MAGETWO-72126 Disabling of randomly failing and timing out Functional Tests
Decrease number of TODO #77
074cba0
Add possibility to create Stock and Source with predefined identifier
a6e4d1a
MSI: Add possibility to create Stock and Source with predefined ident…
18dd50c 
…ifier

-- fix static tests
MSI: Add possibility to create Stock and Source with predefined ident…
a889a42 
…ifier

-- fix static tests
MSI: Add possibility to create Stock and Source with predefined ident…
e4b3593 
…ifier

-- update DocBlocks
Merge remote-tracking branch 'mainline/develop' into merge-mainline
07d0b42
@magento-cicd2
Copy link

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
0 out of 11 committers have signed the CLA.

❌ sidolov
❌ omiroshnichenko
❌ andimov
❌ vil11
❌ irenelagno
❌ fascinosum
❌ eric-bohanon
❌ BaDos
❌ RomaKis
❌ le0n4eg
❌ mslabko

@naydav naydav merged commit bab0610 into develop Sep 4, 2017
@smoskaluk smoskaluk mentioned this pull request Mar 23, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.