Skip to content

MFTF 2.5.4 - Master to Dev merge #530

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

Merged
merged 56 commits into from
Dec 20, 2019
Merged
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
26558bf
Fixed example test cases to point to actual tests
lfolco Sep 15, 2019
1039d79
Fix reference to action groups
lfolco Sep 21, 2019
814a239
Fix reference to data objects
lfolco Sep 21, 2019
4379b7e
Fix invalid line break tags
lfolco Sep 21, 2019
09dd487
Removed contraction.
dobooth Oct 1, 2019
7d37bb4
Grammatical and formatting fixes
lfolco Oct 6, 2019
8c1c2c4
fixed static checks command name
sprankhub Oct 11, 2019
76ecba3
formatting
dobooth Oct 17, 2019
4166518
Merge pull request #465 from lfolco/patch-2
KevinBKozan Oct 17, 2019
87fc327
Merge pull request #477 from lfolco/patch-5
KevinBKozan Oct 17, 2019
5b9639b
Merge pull request #482 from sprankhub/patch-1
KevinBKozan Oct 17, 2019
a7997d9
Merge pull request #453 from lfolco/patch-1
KevinBKozan Oct 18, 2019
fbc2d96
Merge pull request #466 from lfolco/patch-3
KevinBKozan Oct 18, 2019
6f9dc12
MQE-1796: Magento Git vs Composer and MFTF
soumyau Oct 17, 2019
e345f05
MQE-1796: Magento Git vs Composer and MFTF
soumyau Oct 18, 2019
57f2eaa
MQE-1796: Magento Git vs Composer and MFTF
soumyau Oct 18, 2019
49a16cb
Merge pull request #467 from lfolco/patch-4
KevinBKozan Oct 18, 2019
6cfdc49
#339 Add information about web server configuration
DanieliMi Oct 15, 2019
4b8fd60
Formatting and small edits
dobooth Oct 21, 2019
c17c746
MQE-1650: update MFTF configuration to read Test entities from new lo…
KevinBKozan Oct 21, 2019
932db27
Merge pull request #493 from magento/MQE-1650-Fix
KevinBKozan Oct 21, 2019
49d318e
MQE-1796: Magento Git vs Composer and MFTF
soumyau Oct 22, 2019
451430d
MQE-1833: CHANGELOG.MD and Composer version bump
soumyau Oct 22, 2019
2744889
MQE-1796: Magento Git vs Composer and MFTF
soumyau Oct 22, 2019
f2a9c02
MQE-1833: CHANGELOG.MD and Composer version bump
KevinBKozan Oct 23, 2019
6aee6ff
MQE-1833: CHANGELOG.MD and Composer version bump
soumyau Oct 23, 2019
d6c98f3
Merge branch 'MFTF-2.5.2-RC' of https://github.com/magento/magento2-f…
soumyau Oct 23, 2019
449f5e4
MQE-1833: CHANGELOG.MD and Composer version bump
soumyau Oct 23, 2019
e254e73
Merge pull request #494 from magento/MFTF-2.5.2-RC
KevinBKozan Oct 23, 2019
8dce78f
Grammar and formatting
dobooth Oct 24, 2019
2789a15
Trailing space.
dobooth Oct 24, 2019
2df6ebf
Merge pull request #488 from magento/MQE-1796
KevinBKozan Oct 24, 2019
079e3f5
Merge remote-tracking branch 'mage/master' into add-webserver-configu…
DanieliMi Oct 25, 2019
f96bbf5
Merge pull request #496 from DanieliMi/add-webserver-configuration-to…
KevinBKozan Oct 25, 2019
72e69a0
MQE-1870: AllureHelper exception in suites
KevinBKozan Oct 30, 2019
98edf4b
MQE-1870: AllureHelper exception in suites
KevinBKozan Oct 30, 2019
bdbe1ee
MQE-1870: AllureHelper exception in suites
KevinBKozan Oct 30, 2019
f627085
Merge pull request #498 from magento/MQE-1870
KevinBKozan Oct 31, 2019
e97567b
Merge branch 'master' into MFTF2.5.4-RC
KevinBKozan Dec 4, 2019
a51f3bf
MQE-1893: CHANGELOG.MD and Composer version bump
KevinBKozan Dec 5, 2019
6ab962c
MQE-1650: Update MFTF configuration to read Test entities from new lo…
KevinBKozan Dec 5, 2019
efed6e2
Merge pull request #521 from magento/MQE-1650-Composer
KevinBKozan Dec 6, 2019
85160a9
Merge branch 'MFTF2.5.4-RC' into MQE-1893
KevinBKozan Dec 6, 2019
ca2e420
MQE-1893: CHANGELOG.MD and Composer version bump
KevinBKozan Dec 6, 2019
61e6c27
MQE-1908: Change doctor command to work with Curl version of MagentoCLI
jilu1 Dec 6, 2019
b4dbaa4
MQE-1905: Inconsistent environment variable naming for MAGENTO_BACKEN…
jilu1 Dec 6, 2019
a243dbd
MQE-1908: Change doctor command to work with Curl version of MagentoCLI
jilu1 Dec 6, 2019
4c204ac
Merge pull request #525 from magento/MQE-1905-2.5.4
jilu1 Dec 6, 2019
8774ac6
Merge pull request #526 from magento/MQE-1908-2.5.4
jilu1 Dec 6, 2019
9cd8891
MQE-1917: ENABLE_BROWSER_LOG = false attaches JS logs to allure
soumyau Dec 9, 2019
245e116
Merge pull request #527 from magento/MQE-1917
soumyau Dec 9, 2019
1ca5694
Merge pull request #522 from magento/MQE-1893
KevinBKozan Dec 10, 2019
8b031bf
Merge pull request #528 from magento/MFTF2.5.4-RC
KevinBKozan Dec 12, 2019
f4d2eb3
2.5.4-DemoLink
KevinBKozan Dec 12, 2019
4f482ce
Merge pull request #529 from magento/2.5.4-DemoLink
KevinBKozan Dec 12, 2019
ef6cc88
Merge branch 'develop' into MasterToDev
KevinBKozan Dec 19, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'develop' into MasterToDev
  • Loading branch information
KevinBKozan authored Dec 19, 2019
commit ef6cc885d01b1a21c35736de76a63be9534d3ba9

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.