diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f3e88912e5bc9d9b0171783fcfaa246d87a8dbec..673dcfb25a05d495d2e859db42c041e39634791c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,28 +1,31 @@
-# Contribution Guide
+# Contributing to Magento 2 code
-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.
+Contributions to the Magento 2 codebase are done using the fork & pull model.
+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â€).
-## Contribution Process
+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.
-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â€.
-
-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.
-2. Review the [Contributor License Agreement](https://github.com/magento/magento2/blob/master/CONTRIBUTOR_LICENSE_AGREEMENT.html) if this is your first time contributing.
-3. Create and test your work.
-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).
-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.
+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.
-### Contribution Acceptance Criteria
-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.
-2. New features or proposals must be supplied with documentation -- functional (how a feature works) or technical (how it is implemented/designed), or both.
+## Contribution requirements
-## Frequently Asked Questions
+1. Contributions must adhere to [Magento coding standards](http://devdocs.magento.com/guides/v1.0/coding-standards/bk-coding-standards.html).
+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.
+3. Commits must be accompanied by meaningful commit messages.
+4. PRs which include bug fixing, must be accompanied with step-by-step description of how to reproduce the bug.
+3. PRs which include new logic or new features must be submitted along with:
+* Unit/integration test coverage (we will be releasing more information on writing test coverage in the near future).
+* Proposed [documentation](http://devdocs.magento.com) update. Documentation contributions can be submitted [here](https://github.com/magento/devdocs).
+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.
+5. All automated tests are passed successfully (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
-**Do I need to follow all requirements of the contribution process?**
+## Contribution process
-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.
-
-**Do you accept all contributions?**
+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â€.
-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.
+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.
+2. Review the [Contributor License Agreement](https://github.com/magento/magento2/blob/master/CONTRIBUTOR_LICENSE_AGREEMENT.html) if this is your first time contributing.
+3. Create and test your work.
+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).
+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.
diff --git a/app/code/Magento/Catalog/i18n/de_DE.csv b/app/code/Magento/Catalog/i18n/de_DE.csv
index 8b0df7438ce015d65e4ac23080bbc9c5a67408c3..ecbd2cb02116bf9af5c3f6ac5bae02811a89a110 100644
--- a/app/code/Magento/Catalog/i18n/de_DE.csv
+++ b/app/code/Magento/Catalog/i18n/de_DE.csv
@@ -14,7 +14,7 @@ Qty,Qty
Action,Aktion
Reset,Zurücksetzen
Edit,Bearbeiten
-"Add to Cart","Zum Warenkobrn hinzufügen"
+"Add to Cart","Zum Warenkorb hinzufügen"
"Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
"First Name",Vorname
"Last Name","Letzter Name"
diff --git a/app/code/Magento/Reports/i18n/de_DE.csv b/app/code/Magento/Reports/i18n/de_DE.csv
index 2afa2d4426da71b2bb9d16e7ce8c58030a01a160..b2bd8ea9e794c94b53e26c11e1327a4b606c2230 100644
--- a/app/code/Magento/Reports/i18n/de_DE.csv
+++ b/app/code/Magento/Reports/i18n/de_DE.csv
@@ -11,7 +11,7 @@ Subtotal,Zwischensumme
Discount,Discount
Action,Aktion
Total,Gesamtbetrag
-"Add to Cart","Zum Warenkobrn hinzufügen"
+"Add to Cart","Zum Warenkorb hinzufügen"
Orders,Aufträge
Bestsellers,Bestseller
Customer,Kundenname
diff --git a/app/code/Magento/Sales/i18n/de_DE.csv b/app/code/Magento/Sales/i18n/de_DE.csv
index 6cec0c16a19dcdfc2f2ad2c88fb48fc7fe70b71c..38a17ecbf53862979255598c32f030d117e98342 100644
--- a/app/code/Magento/Sales/i18n/de_DE.csv
+++ b/app/code/Magento/Sales/i18n/de_DE.csv
@@ -33,7 +33,7 @@ Total,Gesamt
"Move to Wishlist","Auf Wunschzettel schreiben"
Edit,Bearbeiten
Item,Objekt
-"Add to Cart","Zum Warenkobrn hinzufügen"
+"Add to Cart","Zum Warenkorb hinzufügen"
Sku,SKU
"Order saving error: %1","Order saving error: %1"
"You created the order.","You created the order."
diff --git a/app/code/Magento/Wishlist/i18n/de_DE.csv b/app/code/Magento/Wishlist/i18n/de_DE.csv
index 43fc5de10f58cd7d56db31beb798c1000f58ffc8..364939cebbb084d7898b300060311b23bf45dab1 100644
--- a/app/code/Magento/Wishlist/i18n/de_DE.csv
+++ b/app/code/Magento/Wishlist/i18n/de_DE.csv
@@ -7,7 +7,7 @@ Action,Action
"Are you sure that you want to remove this item?","Are you sure that you want to remove this item?"
Edit,Bearbeiten
"Remove item","Artikel löschen"
-"Add to Cart","Zum Warenkobrn hinzufügen"
+"Add to Cart","Zum Warenkorb hinzufügen"
Delete,Delete
Enabled,Enabled
"We cannot add this item to your shopping cart.","We cannot add this item to your shopping cart."
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
index bc6695ea6cdbfbd40795cb59347ed8c0ac38ef31..e3db90f4ae5c348985082c722a23a946cf441f4d 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
@@ -48,29 +48,29 @@ class DateTest extends \PHPUnit_Framework_TestCase
*/
public function getValueDataProvider()
{
- $currentTime = time();
+ $testTimestamp = strtotime('2014-05-18 12:08:16');
return [
[
[
'date_format' => \Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT,
'time_format' => \Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT,
- 'value' => $currentTime,
+ 'value' => $testTimestamp,
],
- date('n/j/y g:i A', $currentTime),
+ date('n/j/y g:i A', $testTimestamp),
],
[
[
'time_format' => \Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT,
- 'value' => $currentTime,
+ 'value' => $testTimestamp,
],
- date('g:i A', $currentTime)
+ date('g:i A', $testTimestamp)
],
[
[
'date_format' => \Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT,
- 'value' => $currentTime,
+ 'value' => $testTimestamp,
],
- date('n/j/y', $currentTime)
+ date('n/j/y', $testTimestamp)
]
];
}
diff --git a/dev/tools/Magento/Tools/Di/compiler.php b/dev/tools/Magento/Tools/Di/compiler.php
index f838a21987b9a7f1123b3d881765136e05b35ae5..6f185bc3587e6f03ddd65d6b934db10c5679f110 100644
--- a/dev/tools/Magento/Tools/Di/compiler.php
+++ b/dev/tools/Magento/Tools/Di/compiler.php
@@ -27,7 +27,7 @@ $codeScanDir = realpath($rootDir . '/app');
try {
$opt = new Zend_Console_Getopt(
[
- 'serializer=w' => 'serializer function that should be used (serialize|binary) default = serialize',
+ 'serializer=w' => 'serializer function that should be used (serialize|igbinary) default: serialize',
'verbose|v' => 'output report after tool run',
'extra-classes-file=s' => 'path to file with extra proxies and factories to generate',
'generation=s' => 'absolute path to generated classes, <magento_root>/var/generation by default',
@@ -55,7 +55,7 @@ try {
$errorWriter = new Writer\Console();
$log = new Log($logWriter, $errorWriter);
- $serializer = $opt->getOption('serializer') == 'binary' ? new Serializer\Igbinary() : new Serializer\Standard();
+ $serializer = $opt->getOption('serializer') == 'igbinary' ? new Serializer\Igbinary() : new Serializer\Standard();
$validator = new \Magento\Framework\Code\Validator();
$validator->add(new \Magento\Framework\Code\Validator\ConstructorIntegrity());
diff --git a/success.png b/success.png
deleted file mode 100644
index c2853cfc0cbb8856e5baa894332e6f4063428c80..0000000000000000000000000000000000000000
Binary files a/success.png and /dev/null differ
diff --git a/success_admin.png b/success_admin.png
deleted file mode 100644
index 0901763600a4271438c4b604df881ba079dc934f..0000000000000000000000000000000000000000
Binary files a/success_admin.png and /dev/null differ