Skip to content

Commit e3788be

Browse files
author
Stanislav Idolov
committed
Merge remote-tracking branch 'magento2ce/develop' into MAGETWO-31651
2 parents d41b003 + 9c19d10 commit e3788be

File tree

600 files changed

+29888
-1488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

600 files changed

+29888
-1488
lines changed

‎CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
0.42.0-beta2
2+
=============
3+
* Framework improvements:
4+
* Added composer.lock to the repository
5+
* Various improvements:
6+
* Magento PSR-3 compliance
7+
* Updated file iterators to work with symlinks
8+
* Replaced end-to-end test for advanced search with injectable test
9+
* Replaced end-to-end test for quick search with injectable test
10+
* Fixed bugs:
11+
* Fixed an issue where an exception occurred when adding configurable products to cart from the wishlist
12+
* Modify .gitignore CE according to new repos structure (MAGETWO-32095)
13+
* Fixed an issue where the 'Not %Username%?' link was displayed for a logged in user while pages were loaded
14+
* Fixed an issue where Shopping Cart Price Rules based on product attributes were not applied to configurable products
15+
* Fixed an issue where the Tax Class drop-down field on New Customer Group page contained the 'none' value when a tax class already existed
16+
* Fixed an issue where the 'Credit Memo' button was absent on the Invoice page for payments
17+
* Fixed an issue where incorrect totals were shown in the Coupon Usage report
18+
* Fixed an issue where an error occurred and the "Append Comments" checkbox was cleared when submitting an order in the backend
19+
* Fixed an issue where the Transactions tab appeared in the backend for orders where offline payment methods were used
20+
* Fixed an issue with the extra empty line appearing in the Customer Address template
21+
* Github requests:
22+
* [#853](https://github.com/magento/magento2/pull/853) -- Fix spelling error in Customer module xml
23+
* [#858](https://github.com/magento/magento2/pull/858) -- Clicking CMS page in backend takes you to the dashboard
24+
* [#858](https://github.com/magento/magento2/issues/816) -- Clicking CMS page takes you to the dashboard
25+
* [#859](https://github.com/magento/magento2/pull/859) -- Fix email template creation date not being persisted
26+
* [#860](https://github.com/magento/magento2/pull/860) -- Fix currency and price renderer
27+
128
0.42.0-beta1
229
=============
330
* Fixed bugs:

‎CONTRIBUTING.md

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
1-
# Contribution Guide
1+
# Contributing to Magento 2 code
22

3-
The Magento 2 development team will review all issues and contributions submitted by the community of developers. Contributions can take the form of new components/features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations or just good suggestions. To assist in the expediency of the review process, we strongly encourage you to follow all the proper requirements stated below in Definition of Done, before submitting any code for consideration.
3+
Contributions to the Magento 2 codebase are done using the fork & pull model.
4+
This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes (hence the phrase “pull request”).
45

5-
## Contribution Process
6+
Contributions can take the form of new components/features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations or just good suggestions.
67

7-
If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
8-
9-
1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
10-
2. Review the [Contributor License Agreement](https://github.com/magento/magento2/blob/master/CONTRIBUTOR_LICENSE_AGREEMENT.html) if this is your first time contributing.
11-
3. Create and test your work.
12-
4. Fork the Magento 2 repository according to [github's Fork A Repo instructions](https://help.github.com/articles/fork-a-repo) and when you are ready to send us a Pull Request – follow [github's Using Pull Requests instructions](https://help.github.com/articles/using-pull-requests).
13-
5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.
8+
The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor for two weeks, the issue is closed.
149

15-
### Contribution Acceptance Criteria
1610

17-
1. Code changes must be covered with automated tests and supplied along with the patch (or fork). Author chooses the best approach for testing as deemed necessary. See [Magento Automated Testing Standard](https://github.com/magento/magento2/wiki/Magento-Automated-Testing-Standard) for additional guidance.
18-
2. New features or proposals must be supplied with documentation -- functional (how a feature works) or technical (how it is implemented/designed), or both.
11+
## Contribution requirements
1912

20-
## Frequently Asked Questions
13+
1. Contributions must adhere to [Magento coding standards](http://devdocs.magento.com/guides/v1.0/coding-standards/bk-coding-standards.html).
14+
2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request to be merged quickly and without additional clarification requests.
15+
3. Commits must be accompanied by meaningful commit messages.
16+
4. PRs which include bug fixing, must be accompanied with step-by-step description of how to reproduce the bug.
17+
3. PRs which include new logic or new features must be submitted along with:
18+
* Unit/integration test coverage (we will be releasing more information on writing test coverage in the near future).
19+
* Proposed [documentation](http://devdocs.magento.com) update. Documentation contributions can be submitted [here](https://github.com/magento/devdocs).
20+
4. For large features or changes, please [open an issue](https://github.com/magento/magento2/issues) and discuss first. This may prevent duplicate or unnecessary effort, and it may gain you some additional contributors.
21+
5. All automated tests are passed successfully (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
2122

22-
**Do I need to follow all requirements of the contribution process?**
23+
## Contribution process
2324

24-
Yes. We strongly encourage that you follow the requirements as stated, before submitting your code or patch for Magento 2 development team's review. Properly submitted contributions will help the Magento 2 development team to quickly assess your contribution and incorporate it into the Magento 2 project if deemed beneficial.
25-
26-
**Do you accept all contributions?**
25+
If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
2726

28-
Not all contributions will be used or incorporated into the code for the project. The decision to incorporate the code or not is at the discretion of the Magento 2 development team.
27+
1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
28+
2. Review the [Contributor License Agreement](https://github.com/magento/magento2/blob/master/CONTRIBUTOR_LICENSE_AGREEMENT.html) if this is your first time contributing.
29+
3. Create and test your work.
30+
4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html#pull_request).
31+
5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.42.0-beta1",
7-
"magento/module-core": "0.42.0-beta1",
8-
"magento/module-backend": "0.42.0-beta1",
9-
"magento/framework": "0.42.0-beta1",
6+
"magento/module-store": "0.42.0-beta2",
7+
"magento/module-core": "0.42.0-beta2",
8+
"magento/module-backend": "0.42.0-beta2",
9+
"magento/framework": "0.42.0-beta2",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta1",
14+
"version": "0.42.0-beta2",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Authorization/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-backend": "0.42.0-beta1",
7-
"magento/framework": "0.42.0-beta1",
6+
"magento/module-backend": "0.42.0-beta2",
7+
"magento/framework": "0.42.0-beta2",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta1",
11+
"version": "0.42.0-beta2",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/composer.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.42.0-beta1",
7-
"magento/module-directory": "0.42.0-beta1",
8-
"magento/module-core": "0.42.0-beta1",
9-
"magento/module-eav": "0.42.0-beta1",
10-
"magento/module-cron": "0.42.0-beta1",
11-
"magento/module-theme": "0.42.0-beta1",
12-
"magento/module-reports": "0.42.0-beta1",
13-
"magento/module-sales": "0.42.0-beta1",
14-
"magento/module-catalog": "0.42.0-beta1",
15-
"magento/module-user": "0.42.0-beta1",
16-
"magento/module-backup": "0.42.0-beta1",
17-
"magento/module-email": "0.42.0-beta1",
18-
"magento/module-customer": "0.42.0-beta1",
19-
"magento/module-translation": "0.42.0-beta1",
20-
"magento/module-require-js": "0.42.0-beta1",
21-
"magento/framework": "0.42.0-beta1",
6+
"magento/module-store": "0.42.0-beta2",
7+
"magento/module-directory": "0.42.0-beta2",
8+
"magento/module-core": "0.42.0-beta2",
9+
"magento/module-eav": "0.42.0-beta2",
10+
"magento/module-cron": "0.42.0-beta2",
11+
"magento/module-theme": "0.42.0-beta2",
12+
"magento/module-reports": "0.42.0-beta2",
13+
"magento/module-sales": "0.42.0-beta2",
14+
"magento/module-catalog": "0.42.0-beta2",
15+
"magento/module-user": "0.42.0-beta2",
16+
"magento/module-backup": "0.42.0-beta2",
17+
"magento/module-email": "0.42.0-beta2",
18+
"magento/module-customer": "0.42.0-beta2",
19+
"magento/module-translation": "0.42.0-beta2",
20+
"magento/module-require-js": "0.42.0-beta2",
21+
"magento/framework": "0.42.0-beta2",
2222
"magento/magento-composer-installer": "*"
2323
},
2424
"type": "magento2-module",
25-
"version": "0.42.0-beta1",
25+
"version": "0.42.0-beta2",
2626
"license": [
2727
"OSL-3.0",
2828
"AFL-3.0"

‎app/code/Magento/Backup/composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.42.0-beta1",
7-
"magento/module-core": "0.42.0-beta1",
8-
"magento/module-backend": "0.42.0-beta1",
9-
"magento/module-cron": "0.42.0-beta1",
10-
"magento/framework": "0.42.0-beta1",
6+
"magento/module-store": "0.42.0-beta2",
7+
"magento/module-core": "0.42.0-beta2",
8+
"magento/module-backend": "0.42.0-beta2",
9+
"magento/module-cron": "0.42.0-beta2",
10+
"magento/framework": "0.42.0-beta2",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta1",
14+
"version": "0.42.0-beta2",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Bundle/composer.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.42.0-beta1",
7-
"magento/module-catalog": "0.42.0-beta1",
8-
"magento/module-tax": "0.42.0-beta1",
9-
"magento/module-core": "0.42.0-beta1",
10-
"magento/module-backend": "0.42.0-beta1",
11-
"magento/module-sales": "0.42.0-beta1",
12-
"magento/module-checkout": "0.42.0-beta1",
13-
"magento/module-catalog-inventory": "0.42.0-beta1",
14-
"magento/module-customer": "0.42.0-beta1",
15-
"magento/module-catalog-rule": "0.42.0-beta1",
16-
"magento/module-eav": "0.42.0-beta1",
17-
"magento/module-gift-message": "0.42.0-beta1",
18-
"magento/framework": "0.42.0-beta1",
19-
"magento/module-webapi": "0.42.0-beta1",
6+
"magento/module-store": "0.42.0-beta2",
7+
"magento/module-catalog": "0.42.0-beta2",
8+
"magento/module-tax": "0.42.0-beta2",
9+
"magento/module-core": "0.42.0-beta2",
10+
"magento/module-backend": "0.42.0-beta2",
11+
"magento/module-sales": "0.42.0-beta2",
12+
"magento/module-checkout": "0.42.0-beta2",
13+
"magento/module-catalog-inventory": "0.42.0-beta2",
14+
"magento/module-customer": "0.42.0-beta2",
15+
"magento/module-catalog-rule": "0.42.0-beta2",
16+
"magento/module-eav": "0.42.0-beta2",
17+
"magento/module-gift-message": "0.42.0-beta2",
18+
"magento/framework": "0.42.0-beta2",
19+
"magento/module-webapi": "0.42.0-beta2",
2020
"magento/magento-composer-installer": "*"
2121
},
2222
"type": "magento2-module",
23-
"version": "0.42.0-beta1",
23+
"version": "0.42.0-beta2",
2424
"license": [
2525
"OSL-3.0",
2626
"AFL-3.0"

‎app/code/Magento/Captcha/composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.42.0-beta1",
7-
"magento/module-customer": "0.42.0-beta1",
8-
"magento/module-checkout": "0.42.0-beta1",
9-
"magento/module-core": "0.42.0-beta1",
10-
"magento/module-backend": "0.42.0-beta1",
11-
"magento/framework": "0.42.0-beta1",
6+
"magento/module-store": "0.42.0-beta2",
7+
"magento/module-customer": "0.42.0-beta2",
8+
"magento/module-checkout": "0.42.0-beta2",
9+
"magento/module-core": "0.42.0-beta2",
10+
"magento/module-backend": "0.42.0-beta2",
11+
"magento/framework": "0.42.0-beta2",
1212
"magento/magento-composer-installer": "*"
1313
},
1414
"type": "magento2-module",
15-
"version": "0.42.0-beta1",
15+
"version": "0.42.0-beta2",
1616
"license": [
1717
"OSL-3.0",
1818
"AFL-3.0"

‎app/code/Magento/Catalog/composer.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.42.0-beta1",
7-
"magento/module-eav": "0.42.0-beta1",
8-
"magento/module-cms": "0.42.0-beta1",
9-
"magento/module-indexer": "0.42.0-beta1",
10-
"magento/module-customer": "0.42.0-beta1",
11-
"magento/module-core": "0.42.0-beta1",
12-
"magento/module-theme": "0.42.0-beta1",
13-
"magento/module-checkout": "0.42.0-beta1",
14-
"magento/module-log": "0.42.0-beta1",
15-
"magento/module-backend": "0.42.0-beta1",
16-
"magento/module-widget": "0.42.0-beta1",
17-
"magento/module-wishlist": "0.42.0-beta1",
18-
"magento/module-tax": "0.42.0-beta1",
19-
"magento/module-msrp": "0.42.0-beta1",
20-
"magento/module-catalog-inventory": "0.42.0-beta1",
21-
"magento/module-directory": "0.42.0-beta1",
22-
"magento/module-catalog-rule": "0.42.0-beta1",
23-
"magento/module-sales": "0.42.0-beta1",
24-
"magento/module-product-alert": "0.42.0-beta1",
25-
"magento/module-url-rewrite": "0.42.0-beta1",
26-
"magento/module-catalog-url-rewrite": "0.42.0-beta1",
27-
"magento/module-page-cache": "0.42.0-beta1",
28-
"magento/framework": "0.42.0-beta1",
6+
"magento/module-store": "0.42.0-beta2",
7+
"magento/module-eav": "0.42.0-beta2",
8+
"magento/module-cms": "0.42.0-beta2",
9+
"magento/module-indexer": "0.42.0-beta2",
10+
"magento/module-customer": "0.42.0-beta2",
11+
"magento/module-core": "0.42.0-beta2",
12+
"magento/module-theme": "0.42.0-beta2",
13+
"magento/module-checkout": "0.42.0-beta2",
14+
"magento/module-log": "0.42.0-beta2",
15+
"magento/module-backend": "0.42.0-beta2",
16+
"magento/module-widget": "0.42.0-beta2",
17+
"magento/module-wishlist": "0.42.0-beta2",
18+
"magento/module-tax": "0.42.0-beta2",
19+
"magento/module-msrp": "0.42.0-beta2",
20+
"magento/module-catalog-inventory": "0.42.0-beta2",
21+
"magento/module-directory": "0.42.0-beta2",
22+
"magento/module-catalog-rule": "0.42.0-beta2",
23+
"magento/module-sales": "0.42.0-beta2",
24+
"magento/module-product-alert": "0.42.0-beta2",
25+
"magento/module-url-rewrite": "0.42.0-beta2",
26+
"magento/module-catalog-url-rewrite": "0.42.0-beta2",
27+
"magento/module-page-cache": "0.42.0-beta2",
28+
"magento/framework": "0.42.0-beta2",
2929
"magento/magento-composer-installer": "*"
3030
},
3131
"type": "magento2-module",
32-
"version": "0.42.0-beta1",
32+
"version": "0.42.0-beta2",
3333
"license": [
3434
"OSL-3.0",
3535
"AFL-3.0"

‎app/code/Magento/Catalog/i18n/de_DE.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Qty,Qty
1414
Action,Aktion
1515
Reset,Zurücksetzen
1616
Edit,Bearbeiten
17-
"Add to Cart","Zum Warenkobrn hinzufügen"
17+
"Add to Cart","Zum Warenkorb hinzufügen"
1818
"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
1919
"First Name",Vorname
2020
"Last Name","Letzter Name"

0 commit comments

Comments
 (0)