Skip to content

Commit

Permalink
Merge pull request #197 from magento-mpi/publication
Browse files Browse the repository at this point in the history 
[Publication] M2 GitHub Update (version 0.74.0-beta2)
  • Loading branch information
@vpelipenko
vpelipenko committed Mar 31, 2015
2 parents 54d2d3a + 7622645 commit 6d0fb7a
Show file tree
Hide file tree
Showing 110 changed files with 902 additions and 894 deletions.
192 changes: 101 additions & 91 deletions CHANGELOG.md
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions app/code/Magento/AdminNotification/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"magento/module-store": "0.74.0-beta1",
"magento/module-backend": "0.74.0-beta1",
"magento/module-media-storage": "0.74.0-beta1",
"magento/framework": "0.74.0-beta1",
"magento/module-store": "0.74.0-beta2",
"magento/module-backend": "0.74.0-beta2",
"magento/module-media-storage": "0.74.0-beta2",
"magento/framework": "0.74.0-beta2",
"lib-libxml": "*",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.74.0-beta1",
"version": "0.74.0-beta2",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Authorization/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"description": "Authorization module provides access to Magento ACL functionality.",
"require": {
"php": "~5.5.0|~5.6.0",
"magento/module-backend": "0.74.0-beta1",
"magento/framework": "0.74.0-beta1",
"magento/module-backend": "0.74.0-beta2",
"magento/framework": "0.74.0-beta2",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.74.0-beta1",
"version": "0.74.0-beta2",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
36 changes: 18 additions & 18 deletions app/code/Magento/Backend/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"magento/module-store": "0.74.0-beta1",
"magento/module-directory": "0.74.0-beta1",
"magento/module-developer": "0.74.0-beta1",
"magento/module-eav": "0.74.0-beta1",
"magento/module-cron": "0.74.0-beta1",
"magento/module-theme": "0.74.0-beta1",
"magento/module-reports": "0.74.0-beta1",
"magento/module-sales": "0.74.0-beta1",
"magento/module-quote": "0.74.0-beta1",
"magento/module-catalog": "0.74.0-beta1",
"magento/module-user": "0.74.0-beta1",
"magento/module-backup": "0.74.0-beta1",
"magento/module-customer": "0.74.0-beta1",
"magento/module-translation": "0.74.0-beta1",
"magento/module-require-js": "0.74.0-beta1",
"magento/module-config": "0.74.0-beta1",
"magento/framework": "0.74.0-beta1",
"magento/module-store": "0.74.0-beta2",
"magento/module-directory": "0.74.0-beta2",
"magento/module-developer": "0.74.0-beta2",
"magento/module-eav": "0.74.0-beta2",
"magento/module-cron": "0.74.0-beta2",
"magento/module-theme": "0.74.0-beta2",
"magento/module-reports": "0.74.0-beta2",
"magento/module-sales": "0.74.0-beta2",
"magento/module-quote": "0.74.0-beta2",
"magento/module-catalog": "0.74.0-beta2",
"magento/module-user": "0.74.0-beta2",
"magento/module-backup": "0.74.0-beta2",
"magento/module-customer": "0.74.0-beta2",
"magento/module-translation": "0.74.0-beta2",
"magento/module-require-js": "0.74.0-beta2",
"magento/module-config": "0.74.0-beta2",
"magento/framework": "0.74.0-beta2",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.74.0-beta1",
"version": "0.74.0-beta2",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
10 changes: 5 additions & 5 deletions app/code/Magento/Backup/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"magento/module-store": "0.74.0-beta1",
"magento/module-backend": "0.74.0-beta1",
"magento/module-cron": "0.74.0-beta1",
"magento/framework": "0.74.0-beta1",
"magento/module-store": "0.74.0-beta2",
"magento/module-backend": "0.74.0-beta2",
"magento/module-cron": "0.74.0-beta2",
"magento/framework": "0.74.0-beta2",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.74.0-beta1",
"version": "0.74.0-beta2",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
34 changes: 17 additions & 17 deletions app/code/Magento/Bundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"magento/module-store": "0.74.0-beta1",
"magento/module-catalog": "0.74.0-beta1",
"magento/module-tax": "0.74.0-beta1",
"magento/module-backend": "0.74.0-beta1",
"magento/module-sales": "0.74.0-beta1",
"magento/module-checkout": "0.74.0-beta1",
"magento/module-catalog-inventory": "0.74.0-beta1",
"magento/module-customer": "0.74.0-beta1",
"magento/module-catalog-rule": "0.74.0-beta1",
"magento/module-eav": "0.74.0-beta1",
"magento/module-config": "0.74.0-beta1",
"magento/module-gift-message": "0.74.0-beta1",
"magento/framework": "0.74.0-beta1",
"magento/module-quote": "0.74.0-beta1",
"magento/module-media-storage": "0.74.0-beta1",
"magento/module-store": "0.74.0-beta2",
"magento/module-catalog": "0.74.0-beta2",
"magento/module-tax": "0.74.0-beta2",
"magento/module-backend": "0.74.0-beta2",
"magento/module-sales": "0.74.0-beta2",
"magento/module-checkout": "0.74.0-beta2",
"magento/module-catalog-inventory": "0.74.0-beta2",
"magento/module-customer": "0.74.0-beta2",
"magento/module-catalog-rule": "0.74.0-beta2",
"magento/module-eav": "0.74.0-beta2",
"magento/module-config": "0.74.0-beta2",
"magento/module-gift-message": "0.74.0-beta2",
"magento/framework": "0.74.0-beta2",
"magento/module-quote": "0.74.0-beta2",
"magento/module-media-storage": "0.74.0-beta2",
"magento/magento-composer-installer": "*"
},
"suggest": {
"magento/module-webapi": "0.74.0-beta1"
"magento/module-webapi": "0.74.0-beta2"
},
"type": "magento2-module",
"version": "0.74.0-beta1",
"version": "0.74.0-beta2",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
12 changes: 6 additions & 6 deletions app/code/Magento/Captcha/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"magento/module-store": "0.74.0-beta1",
"magento/module-customer": "0.74.0-beta1",
"magento/module-checkout": "0.74.0-beta1",
"magento/module-backend": "0.74.0-beta1",
"magento/framework": "0.74.0-beta1",
"magento/module-store": "0.74.0-beta2",
"magento/module-customer": "0.74.0-beta2",
"magento/module-checkout": "0.74.0-beta2",
"magento/module-backend": "0.74.0-beta2",
"magento/framework": "0.74.0-beta2",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.74.0-beta1",
"version": "0.74.0-beta2",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
52 changes: 26 additions & 26 deletions app/code/Magento/Catalog/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"magento/module-store": "0.74.0-beta1",
"magento/module-eav": "0.74.0-beta1",
"magento/module-cms": "0.74.0-beta1",
"magento/module-indexer": "0.74.0-beta1",
"magento/module-customer": "0.74.0-beta1",
"magento/module-theme": "0.74.0-beta1",
"magento/module-checkout": "0.74.0-beta1",
"magento/module-log": "0.74.0-beta1",
"magento/module-backend": "0.74.0-beta1",
"magento/module-widget": "0.74.0-beta1",
"magento/module-wishlist": "0.74.0-beta1",
"magento/module-tax": "0.74.0-beta1",
"magento/module-msrp": "0.74.0-beta1",
"magento/module-catalog-inventory": "0.74.0-beta1",
"magento/module-directory": "0.74.0-beta1",
"magento/module-catalog-rule": "0.74.0-beta1",
"magento/module-product-alert": "0.74.0-beta1",
"magento/module-url-rewrite": "0.74.0-beta1",
"magento/module-catalog-url-rewrite": "0.74.0-beta1",
"magento/module-page-cache": "0.74.0-beta1",
"magento/module-quote": "0.74.0-beta1",
"magento/module-config": "0.74.0-beta1",
"magento/module-media-storage": "0.74.0-beta1",
"magento/framework": "0.74.0-beta1",
"magento/module-store": "0.74.0-beta2",
"magento/module-eav": "0.74.0-beta2",
"magento/module-cms": "0.74.0-beta2",
"magento/module-indexer": "0.74.0-beta2",
"magento/module-customer": "0.74.0-beta2",
"magento/module-theme": "0.74.0-beta2",
"magento/module-checkout": "0.74.0-beta2",
"magento/module-log": "0.74.0-beta2",
"magento/module-backend": "0.74.0-beta2",
"magento/module-widget": "0.74.0-beta2",
"magento/module-wishlist": "0.74.0-beta2",
"magento/module-tax": "0.74.0-beta2",
"magento/module-msrp": "0.74.0-beta2",
"magento/module-catalog-inventory": "0.74.0-beta2",
"magento/module-directory": "0.74.0-beta2",
"magento/module-catalog-rule": "0.74.0-beta2",
"magento/module-product-alert": "0.74.0-beta2",
"magento/module-url-rewrite": "0.74.0-beta2",
"magento/module-catalog-url-rewrite": "0.74.0-beta2",
"magento/module-page-cache": "0.74.0-beta2",
"magento/module-quote": "0.74.0-beta2",
"magento/module-config": "0.74.0-beta2",
"magento/module-media-storage": "0.74.0-beta2",
"magento/framework": "0.74.0-beta2",
"magento/magento-composer-installer": "*"
},
"suggest": {
"magento/module-cookie": "0.74.0-beta1"
"magento/module-cookie": "0.74.0-beta2"
},
"type": "magento2-module",
"version": "0.74.0-beta1",
"version": "0.74.0-beta2",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ $categoryId = $block->getCategoryId();

<div data-id="information-dialog-category" class="messages admin__scope" style="display: none;">
<div class="message message-notice">
<div><?php echo __('This operation can take much time'); ?></div>
<div><?php echo __('This operation can take a long time'); ?></div>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<div data-id="information-dialog-tree" class="messages admin__scope" style="display: none;">
<div class="message message-notice">
<div><?php echo __('This operation can take much time'); ?></div>
<div><?php echo __('This operation can take a long time'); ?></div>
</div>
</div>
<!--[if IE]>
Expand Down
20 changes: 10 additions & 10 deletions app/code/Magento/CatalogImportExport/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"magento/module-catalog": "0.74.0-beta1",
"magento/module-eav": "0.74.0-beta1",
"magento/module-import-export": "0.74.0-beta1",
"magento/module-indexer": "0.74.0-beta1",
"magento/module-store": "0.74.0-beta1",
"magento/module-catalog-inventory": "0.74.0-beta1",
"magento/module-media-storage": "0.74.0-beta1",
"magento/module-customer": "0.74.0-beta1",
"magento/framework": "0.74.0-beta1",
"magento/module-catalog": "0.74.0-beta2",
"magento/module-eav": "0.74.0-beta2",
"magento/module-import-export": "0.74.0-beta2",
"magento/module-indexer": "0.74.0-beta2",
"magento/module-store": "0.74.0-beta2",
"magento/module-catalog-inventory": "0.74.0-beta2",
"magento/module-media-storage": "0.74.0-beta2",
"magento/module-customer": "0.74.0-beta2",
"magento/framework": "0.74.0-beta2",
"ext-ctype": "*",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.74.0-beta1",
"version": "0.74.0-beta2",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
18 changes: 9 additions & 9 deletions app/code/Magento/CatalogInventory/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"magento/module-config": "0.74.0-beta1",
"magento/module-store": "0.74.0-beta1",
"magento/module-catalog": "0.74.0-beta1",
"magento/module-customer": "0.74.0-beta1",
"magento/module-indexer": "0.74.0-beta1",
"magento/module-eav": "0.74.0-beta1",
"magento/module-quote": "0.74.0-beta1",
"magento/framework": "0.74.0-beta1",
"magento/module-config": "0.74.0-beta2",
"magento/module-store": "0.74.0-beta2",
"magento/module-catalog": "0.74.0-beta2",
"magento/module-customer": "0.74.0-beta2",
"magento/module-indexer": "0.74.0-beta2",
"magento/module-eav": "0.74.0-beta2",
"magento/module-quote": "0.74.0-beta2",
"magento/framework": "0.74.0-beta2",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.74.0-beta1",
"version": "0.74.0-beta2",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
20 changes: 10 additions & 10 deletions app/code/Magento/CatalogRule/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"magento/module-store": "0.74.0-beta1",
"magento/module-rule": "0.74.0-beta1",
"magento/module-catalog": "0.74.0-beta1",
"magento/module-customer": "0.74.0-beta1",
"magento/module-backend": "0.74.0-beta1",
"magento/module-eav": "0.74.0-beta1",
"magento/module-indexer": "0.74.0-beta1",
"magento/module-import-export": "0.74.0-beta1",
"magento/framework": "0.74.0-beta1",
"magento/module-store": "0.74.0-beta2",
"magento/module-rule": "0.74.0-beta2",
"magento/module-catalog": "0.74.0-beta2",
"magento/module-customer": "0.74.0-beta2",
"magento/module-backend": "0.74.0-beta2",
"magento/module-eav": "0.74.0-beta2",
"magento/module-indexer": "0.74.0-beta2",
"magento/module-import-export": "0.74.0-beta2",
"magento/framework": "0.74.0-beta2",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.74.0-beta1",
"version": "0.74.0-beta2",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
22 changes: 11 additions & 11 deletions app/code/Magento/CatalogSearch/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"magento/module-store": "0.74.0-beta1",
"magento/module-catalog": "0.74.0-beta1",
"magento/module-search": "0.74.0-beta1",
"magento/module-customer": "0.74.0-beta1",
"magento/module-directory": "0.74.0-beta1",
"magento/module-indexer": "0.74.0-beta1",
"magento/module-eav": "0.74.0-beta1",
"magento/module-backend": "0.74.0-beta1",
"magento/module-theme": "0.74.0-beta1",
"magento/framework": "0.74.0-beta1",
"magento/module-store": "0.74.0-beta2",
"magento/module-catalog": "0.74.0-beta2",
"magento/module-search": "0.74.0-beta2",
"magento/module-customer": "0.74.0-beta2",
"magento/module-directory": "0.74.0-beta2",
"magento/module-indexer": "0.74.0-beta2",
"magento/module-eav": "0.74.0-beta2",
"magento/module-backend": "0.74.0-beta2",
"magento/module-theme": "0.74.0-beta2",
"magento/framework": "0.74.0-beta2",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.74.0-beta1",
"version": "0.74.0-beta2",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
Loading

0 comments on commit 6d0fb7a

Please sign in to comment.