Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
PATCH_SUPEE-6482_CE_1.9.2.0-1.9.2.1_v2-UPDATE.sh
This file has been truncated, but you can view the full file.
diff -ruN app/code/core/Mage/Api/Model/Server/Adapter/Soap.php app/code/core/Mage/Api/Model/Server/Adapter/Soap.php
--- app/code/core/Mage/Api/Model/Server/Adapter/Soap.php 2015-06-26 10:53:38.000000000 +0200
+++ app/code/core/Mage/Api/Model/Server/Adapter/Soap.php 2015-08-03 12:35:02.000000000 +0200
@@ -233,9 +233,9 @@
: $urlModel->getUrl('*/*/*');
if ( $withAuth ) {
- $phpAuthUser = $this->getController()->getRequest()->getServer('PHP_AUTH_USER', false);
- $phpAuthPw = $this->getController()->getRequest()->getServer('PHP_AUTH_PW', false);
- $scheme = $this->getController()->getRequest()->getScheme();
+ $phpAuthUser = rawurlencode($this->getController()->getRequest()->getServer('PHP_AUTH_USER', false));
+ $phpAuthPw = rawurlencode($this->getController()->getRequest()->getServer('PHP_AUTH_PW', false));
+ $scheme = rawurlencode($this->getController()->getRequest()->getScheme());
if ($phpAuthUser && $phpAuthPw) {
$wsdlUrl = sprintf("%s://%s:%s@%s", $scheme, $phpAuthUser, $phpAuthPw,
diff -ruN app/code/core/Mage/Catalog/etc/api.xml app/code/core/Mage/Catalog/etc/api.xml
--- app/code/core/Mage/Catalog/etc/api.xml 2015-06-26 10:53:38.000000000 +0200
+++ app/code/core/Mage/Catalog/etc/api.xml 2015-08-03 12:35:04.000000000 +0200
@@ -163,7 +163,7 @@
<title>Update product</title>
<acl>catalog/product/update</acl>
</update>
- <multiUpdate translate="title" module="Mage_Catalog">
+ <multiUpdate translate="title" module="catalog">
<title>Multi update product</title>
<acl>catalog/product/update</acl>
</multiUpdate>
diff -ruN app/code/core/Mage/Catalog/Helper/Product/Compare.php app/code/core/Mage/Catalog/Helper/Product/Compare.php
--- app/code/core/Mage/Catalog/Helper/Product/Compare.php 2015-06-26 10:53:38.000000000 +0200
+++ app/code/core/Mage/Catalog/Helper/Product/Compare.php 2015-08-03 12:35:04.000000000 +0200
@@ -161,7 +161,7 @@
*/
public function getAddUrl($product)
{
- if ($this->_logCondition->isVisitorLogEnabled()) {
+ if ($this->_logCondition->isVisitorLogEnabled() || $this->_customerSession->isLoggedIn()) {
return $this->_getUrl('catalog/product_compare/add', $this->_getUrlParams($product));
}
return '';
diff -ruN app/code/core/Mage/Catalog/Model/Product/Api/V2.php app/code/core/Mage/Catalog/Model/Product/Api/V2.php
--- app/code/core/Mage/Catalog/Model/Product/Api/V2.php 2015-06-26 10:53:38.000000000 +0200
+++ app/code/core/Mage/Catalog/Model/Product/Api/V2.php 2015-08-03 12:35:04.000000000 +0200
@@ -108,7 +108,7 @@
*/
public function create($type, $set, $sku, $productData, $store = null)
{
- if (!$type || !$set || !$sku) {
+ if (!$type || !$set || !$sku || !is_object($productData)) {
$this->_fault('data_invalid');
}
@@ -243,6 +243,9 @@
*/
protected function _prepareDataForSave ($product, $productData)
{
+ if (!is_object($productData)) {
+ $this->_fault('data_invalid');
+ }
if (property_exists($productData, 'website_ids') && is_array($productData->website_ids)) {
$product->setWebsiteIds($productData->website_ids);
}
diff -ruN app/code/core/Mage/Cms/Block/Block.php app/code/core/Mage/Cms/Block/Block.php
--- app/code/core/Mage/Cms/Block/Block.php 2015-06-26 10:53:38.000000000 +0200
+++ app/code/core/Mage/Cms/Block/Block.php 2015-08-03 12:35:02.000000000 +0200
@@ -72,4 +72,24 @@
}
return $html;
}
+
+ /**
+ * Retrieve values of properties that unambiguously identify unique content
+ *
+ * @return array
+ */
+ public function getCacheKeyInfo()
+ {
+ $blockId = $this->getBlockId();
+ if ($blockId) {
+ $result = array(
+ 'CMS_BLOCK',
+ $blockId,
+ Mage::app()->getStore()->getCode(),
+ );
+ } else {
+ $result = parent::getCacheKeyInfo();
+ }
+ return $result;
+ }
}
diff -ruN app/code/core/Mage/Cms/Block/Widget/Block.php app/code/core/Mage/Cms/Block/Widget/Block.php
--- app/code/core/Mage/Cms/Block/Widget/Block.php 2015-06-26 10:53:38.000000000 +0200
+++ app/code/core/Mage/Cms/Block/Widget/Block.php 2015-08-03 12:35:02.000000000 +0200
@@ -82,10 +82,26 @@
$helper = Mage::helper('cms');
$processor = $helper->getBlockTemplateProcessor();
$this->setText($processor->filter($block->getContent()));
+ $this->addModelTags($block);
}
}
unset(self::$_widgetUsageMap[$blockHash]);
return $this;
}
+
+ /**
+ * Retrieve values of properties that unambiguously identify unique content
+ *
+ * @return array
+ */
+ public function getCacheKeyInfo()
+ {
+ $result = parent::getCacheKeyInfo();
+ $blockId = $this->getBlockId();
+ if ($blockId) {
+ $result[] = $blockId;
+ }
+ return $result;
+ }
}
diff -ruN app/code/core/Mage/Core/Controller/Request/Http.php app/code/core/Mage/Core/Controller/Request/Http.php
--- app/code/core/Mage/Core/Controller/Request/Http.php 2015-06-26 10:53:38.000000000 +0200
+++ app/code/core/Mage/Core/Controller/Request/Http.php 2015-08-03 12:35:04.000000000 +0200
@@ -298,11 +298,19 @@
if (!isset($_SERVER['HTTP_HOST'])) {
return false;
}
+ $host = $_SERVER['HTTP_HOST'];
if ($trimPort) {
- $host = explode(':', $_SERVER['HTTP_HOST']);
- return $host[0];
+ $hostParts = explode(':', $_SERVER['HTTP_HOST']);
+ $host = $hostParts[0];
}
- return $_SERVER['HTTP_HOST'];
+
+ if (strpos($host, ',') !== false || strpos($host, ';') !== false) {
+ $response = new Zend_Controller_Response_Http();
+ $response->setHttpResponseCode(400)->sendHeaders();
+ exit();
+ }
+
+ return $host;
}
/**
diff -ruN app/code/core/Mage/Core/Model/Email/Queue.php app/code/core/Mage/Core/Model/Email/Queue.php
--- app/code/core/Mage/Core/Model/Email/Queue.php 2015-06-26 10:53:38.000000000 +0200
+++ app/code/core/Mage/Core/Model/Email/Queue.php 2015-08-03 12:35:04.000000000 +0200
@@ -41,9 +41,6 @@
* @method Mage_Core_Model_Email_Queue setMessageParameters(array $value)
* @method Mage_Core_Model_Email_Queue setProcessedAt(string $value)
* @method array getMessageParameters()
- *
- * @category Mage
- * @package Mage_Core
*/
class Mage_Core_Model_Email_Queue extends Mage_Core_Model_Abstract
{
diff -ruN app/code/core/Mage/Log/Model/Resource/Visitor.php app/code/core/Mage/Log/Model/Resource/Visitor.php
--- app/code/core/Mage/Log/Model/Resource/Visitor.php 2015-06-26 10:53:38.000000000 +0200
+++ app/code/core/Mage/Log/Model/Resource/Visitor.php 2015-08-03 12:35:04.000000000 +0200
@@ -125,7 +125,7 @@
return $this;
}
if ($visitor->getIsNewVisitor()) {
- if ($this->_urlLoggingCondition->isLogEnabled()) {
+ if ($this->_urlLoggingCondition->isVisitorLogEnabled()) {
$this->_saveVisitorInfo($visitor);
$visitor->setIsNewVisitor(false);
}
diff -ruN app/code/core/Mage/PageCache/etc/adminhtml.xml app/code/core/Mage/PageCache/etc/adminhtml.xml
--- app/code/core/Mage/PageCache/etc/adminhtml.xml 2015-06-26 10:53:38.000000000 +0200
+++ app/code/core/Mage/PageCache/etc/adminhtml.xml 2015-08-03 12:35:02.000000000 +0200
@@ -30,7 +30,7 @@
<resources>
<admin>
<children>
- <page_cache translate="title" module="pageCache">
+ <page_cache translate="title" module="pagecache">
<title>External Page Cache</title>
<sort_order>0</sort_order>
</page_cache>
diff -ruN app/code/core/Mage/Paypal/Model/Express/Checkout.php app/code/core/Mage/Paypal/Model/Express/Checkout.php
--- app/code/core/Mage/Paypal/Model/Express/Checkout.php 2015-06-26 10:53:38.000000000 +0200
+++ app/code/core/Mage/Paypal/Model/Express/Checkout.php 2015-08-03 12:37:40.000000000 +0200
@@ -430,15 +430,17 @@
if (!$quote->getIsVirtual()) {
$shippingAddress = $quote->getShippingAddress();
if ($shippingAddress) {
- if ($exportedShippingAddress
- && $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1
- ) {
+ if ($exportedShippingAddress) {
$this->_setExportedAddressData($shippingAddress, $exportedShippingAddress);
- // PayPal doesn't provide detailed shipping info: prefix, middlename, lastname, suffix
- $shippingAddress->setPrefix(null);
- $shippingAddress->setMiddlename(null);
- $shippingAddress->setLastname(null);
- $shippingAddress->setSuffix(null);
+
+ if ($quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1) {
+ // PayPal doesn't provide detailed shipping info: prefix, middlename, lastname, suffix
+ $shippingAddress->setPrefix(null);
+ $shippingAddress->setMiddlename(null);
+ $shippingAddress->setLastname(null);
+ $shippingAddress->setSuffix(null);
+ }
+
$shippingAddress->setCollectShippingRates(true);
$shippingAddress->setSameAsBilling(0);
}
diff -ruN app/design/adminhtml/default/default/template/page/js/calendar.phtml app/design/adminhtml/default/default/template/page/js/calendar.phtml
--- app/design/adminhtml/default/default/template/page/js/calendar.phtml 2015-06-26 10:53:38.000000000 +0200
+++ app/design/adminhtml/default/default/template/page/js/calendar.phtml 2015-08-03 12:35:04.000000000 +0200
@@ -23,7 +23,6 @@
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-// no notice of license for now
?>
<?php
diff -ruN app/design/frontend/base/default/template/moneybookers/blank.phtml app/design/frontend/base/default/template/moneybookers/blank.phtml
--- app/design/frontend/base/default/template/moneybookers/blank.phtml 2015-06-26 10:53:38.000000000 +0200
+++ app/design/frontend/base/default/template/moneybookers/blank.phtml 2015-08-03 12:35:04.000000000 +0200
@@ -20,7 +20,7 @@
*
* @category design
* @package base_default
- * @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2015 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
?>
diff -ruN app/design/frontend/base/default/template/moneybookers/form.phtml app/design/frontend/base/default/template/moneybookers/form.phtml
--- app/design/frontend/base/default/template/moneybookers/form.phtml 2015-06-26 10:53:38.000000000 +0200
+++ app/design/frontend/base/default/template/moneybookers/form.phtml 2015-08-03 12:35:04.000000000 +0200
@@ -20,7 +20,7 @@
*
* @category design
* @package base_default
- * @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2015 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
?>
diff -ruN app/design/frontend/base/default/template/moneybookers/info.phtml app/design/frontend/base/default/template/moneybookers/info.phtml
--- app/design/frontend/base/default/template/moneybookers/info.phtml 2015-06-26 10:53:38.000000000 +0200
+++ app/design/frontend/base/default/template/moneybookers/info.phtml 2015-08-03 12:35:04.000000000 +0200
@@ -20,7 +20,7 @@
*
* @category design
* @package base_default
- * @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2015 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
?>
diff -ruN app/design/frontend/base/default/template/moneybookers/payment.phtml app/design/frontend/base/default/template/moneybookers/payment.phtml
--- app/design/frontend/base/default/template/moneybookers/payment.phtml 2015-06-26 10:53:38.000000000 +0200
+++ app/design/frontend/base/default/template/moneybookers/payment.phtml 2015-08-03 12:35:04.000000000 +0200
@@ -20,7 +20,7 @@
*
* @category design
* @package base_default
- * @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2015 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
?>
diff -ruN app/design/frontend/base/default/template/moneybookers/placeform.phtml app/design/frontend/base/default/template/moneybookers/placeform.phtml
--- app/design/frontend/base/default/template/moneybookers/placeform.phtml 2015-06-26 10:53:38.000000000 +0200
+++ app/design/frontend/base/default/template/moneybookers/placeform.phtml 2015-08-03 12:35:04.000000000 +0200
@@ -20,7 +20,7 @@
*
* @category design
* @package base_default
- * @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2015 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
?>
diff -ruN app/design/frontend/base/default/template/moneybookers/redirect.phtml app/design/frontend/base/default/template/moneybookers/redirect.phtml
--- app/design/frontend/base/default/template/moneybookers/redirect.phtml 2015-06-26 10:53:38.000000000 +0200
+++ app/design/frontend/base/default/template/moneybookers/redirect.phtml 2015-08-03 12:35:04.000000000 +0200
@@ -20,7 +20,7 @@
*
* @category design
* @package base_default
- * @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2015 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
?>
diff -ruN app/design/frontend/base/default/template/page/js/cookie.phtml app/design/frontend/base/default/template/page/js/cookie.phtml
--- app/design/frontend/base/default/template/page/js/cookie.phtml 2015-06-26 10:53:38.000000000 +0200
+++ app/design/frontend/base/default/template/page/js/cookie.phtml 2015-08-03 12:35:04.000000000 +0200
@@ -34,7 +34,7 @@
<script type="text/javascript">
//<![CDATA[
-Mage.Cookies.path = '<?php echo $this->getPath()?>';
-Mage.Cookies.domain = '<?php echo $this->getDomain()?>';
+Mage.Cookies.path = '<?php echo Mage::helper('core')->jsQuoteEscape($this->getPath()) ?>';
+Mage.Cookies.domain = '<?php echo Mage::helper('core')->jsQuoteEscape($this->getDomain()) ?>';
//]]>
</script>
diff -ruN app/locale/en_US/Mage_Adminhtml.csv app/locale/en_US/Mage_Adminhtml.csv
--- app/locale/en_US/Mage_Adminhtml.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Adminhtml.csv 2015-08-03 12:35:02.000000000 +0200
@@ -19,6 +19,7 @@
"* Required Fields","* Required Fields"
"- Click on any of the time parts to increase it","- Click on any of the time parts to increase it"
"- Hold mouse button on any of the above buttons for faster selection.","- Hold mouse button on any of the above buttons for faster selection."
+"- Use the %s buttons to select month","- Use the %s buttons to select month"
"- Use the %s, %s buttons to select month","- Use the %s, %s buttons to select month"
"- Use the %s, %s buttons to select year","- Use the %s, %s buttons to select year"
"- or Shift-click to decrease it","- or Shift-click to decrease it"
@@ -76,6 +77,7 @@
"Add URL Rewrite for a Category","Add URL Rewrite for a Category"
"Add URL Rewrite for a Product","Add URL Rewrite for a Product"
"Add after","Add after"
+"Add to category","Add to category"
"Additional Cache Management","Additional Cache Management"
"Address Type:","Address Type:"
"Admin","Admin"
@@ -89,6 +91,7 @@
"All Files","All Files"
"All Reviews","All Reviews"
"All Store Views","All Store Views"
+"All Storefronts","All Storefronts"
"All Tags","All Tags"
"All Websites","All Websites"
"All countries","All countries"
@@ -96,6 +99,7 @@
"All possible rates were fetched, please click on ""Save"" to apply","All possible rates were fetched, please click on ""Save"" to apply"
"All rates were fetched, please click on ""Save"" to apply","All rates were fetched, please click on ""Save"" to apply"
"All valid rates have been saved.","All valid rates have been saved."
+"Already in category","Already in category"
"Always (during development)","Always (during development)"
"Amounts","Amounts"
"An error has occured while syncronizing media storages.","An error has occured while syncronizing media storages."
@@ -182,6 +186,7 @@
"Cache Management","Cache Management"
"Cache Type","Cache Type"
"Cancel","Cancel"
+"Cancel detach","Cancel detach"
"Cannot add new comment.","Cannot add new comment."
"Cannot add tracking number.","Cannot add tracking number."
"Cannot create an invoice without products.","Cannot create an invoice without products."
@@ -199,6 +204,7 @@
"Cannot send shipment information.","Cannot send shipment information."
"Cannot update item quantity.","Cannot update item quantity."
"Cannot update the item\'s quantity.","Cannot update the item\'s quantity."
+"Card Verification Number","Card Verification Number"
"Catalog","Catalog"
"Catalog Price Rules","Catalog Price Rules"
"Catalog Rewrites","Catalog Rewrites"
@@ -236,7 +242,12 @@
"Create New Attribute","Create New Attribute"
"Create URL Rewrite:","Create URL Rewrite:"
"Created At","Created At"
+"Creation date","Creation date"
"Credit Card %s","Credit Card %s"
+"Credit Card Number","Credit Card Number"
+"Credit Card Number: xxxx-%s","Credit Card Number: xxxx-%s"
+"Credit Card Type","Credit Card Type"
+"Credit Card Type: %s","Credit Card Type: %s"
"Credit Memo History","Credit Memo History"
"Credit Memo Totals","Credit Memo Totals"
"Credit Memos","Credit Memos"
@@ -302,6 +313,7 @@
"Description","Description"
"Design","Design"
"Design Section","Design Section"
+"Detach from category","Detach from category"
"Details","Details"
"Developer Section","Developer Section"
"Direction:","Direction:"
@@ -313,6 +325,7 @@
"Do you really want to KILL parallel process and start new indexing process?","Do you really want to KILL parallel process and start new indexing process?"
"Do you really want to proceed?","Do you really want to proceed?"
"Download","Download"
+"Download SKUs","Download SKUs"
"Downloads","Downloads"
"Drag to move","Drag to move"
"Drop-down","Drop-down"
@@ -338,13 +351,17 @@
"Enable","Enable"
"Enabled","Enabled"
"Enclose Values In:","Enclose Values In:"
+"Enter a comma separated list of SKUs that will always be displayed at the top of your category","Enter a comma separated list of SKUs that will always be displayed at the top of your category"
"Entity Attributes","Entity Attributes"
"Entity Type","Entity Type"
"Entity type:","Entity type:"
"Error","Error"
"Excel XML","Excel XML"
"Excl. Tax","Excl. Tax"
+"Excl. Tax:","Excl. Tax:"
"Exclude media folder from backup","Exclude media folder from backup"
+"Expiration Date","Expiration Date"
+"Expiration Date: %s/%s","Expiration Date: %s/%s"
"Export","Export"
"Export CSV","Export CSV"
"Export Filters","Export Filters"
@@ -396,9 +413,11 @@
"Global Record Search","Global Record Search"
"Global Search","Global Search"
"Go Today","Go Today"
+"Go to Top","Go to Top"
"Go to messages inbox","Go to messages inbox"
"Go to notifications","Go to notifications"
"Google Base","Google Base"
+"Google Content","Google Content"
"Google Sitemaps","Google Sitemaps"
"Grand Total","Grand Total"
"Grid (default) / List","Grid (default) / List"
@@ -410,6 +429,7 @@
"Help Us Keep Magento Healthy - Report All Bugs","Help Us Keep Magento Healthy - Report All Bugs"
"Helper attributes should not be used in custom layout updates.","Helper attributes should not be used in custom layout updates."
"Helper for options rendering doesn't implement required interface.","Helper for options rendering doesn't implement required interface."
+"Hero Products","Hero Products"
"Home","Home"
"ID","ID"
"ID Path","ID Path"
@@ -435,6 +455,7 @@
"In File:","In File:"
"Inactive","Inactive"
"Incl. Tax","Incl. Tax"
+"Incl. Tax:","Incl. Tax:"
"Incoming Message","Incoming Message"
"Insert Variable...","Insert Variable..."
"Interactive","Interactive"
@@ -536,6 +557,7 @@
"Manage Tax Zones and Rates","Manage Tax Zones and Rates"
"Manage Titles (Size, Color, etc.)","Manage Titles (Size, Color, etc.)"
"Manual","Manual"
+"Mass Product Assignment","Mass Product Assignment"
"Matched Expression","Matched Expression"
"Maximum sender name length is 255. Please correct your settings.","Maximum sender name length is 255. Please correct your settings."
"Mb","Mb"
@@ -545,12 +567,16 @@
"Month","Month"
"Most Viewed","Most Viewed"
"Most Viewed Products","Most Viewed Products"
+"Move to bottom","Move to bottom"
+"Move to top","Move to top"
"Multiple Select","Multiple Select"
"My Account","My Account"
"My Applications","My Applications"
"N/A","N/A"
"NOTICE","NOTICE"
"Name","Name"
+"Name on Card","Name on Card"
+"Name on the Card: %s","Name on the Card: %s"
"Name:","Name:"
"Never (production)","Never (production)"
"New ","New "
@@ -591,6 +617,7 @@
"New User","New User"
"New Variable","New Variable"
"New Website","New Website"
+"New attribute set mapping","New attribute set mapping"
"New password field cannot be empty.","New password field cannot be empty."
"Newsletter","Newsletter"
"Newsletter Problems","Newsletter Problems"
@@ -601,7 +628,9 @@
"Next year (hold for menu)","Next year (hold for menu)"
"No","No"
"No (price without tax)","No (price without tax)"
+"No Data","No Data"
"No Data Found","No Data Found"
+"No Products","No Products"
"No Templates Found","No Templates Found"
"No change","No change"
"No customer id defined.","No customer id defined."
@@ -637,6 +666,7 @@
"Optional","Optional"
"Options","Options"
"Options is required","Options is required"
+"Options: ","Options: "
"Order","Order"
"Order #%s","Order #%s"
"Order #%s (%s)","Order #%s (%s)"
@@ -700,6 +730,7 @@
"Please make sure that all global admin search modules are installed and activated.","Please make sure that all global admin search modules are installed and activated."
"Please make sure that your changes were saved before running the profile.","Please make sure that your changes were saved before running the profile."
"Please make sure your passwords match.","Please make sure your passwords match."
+"Please note, this category is set to automatically sort. Any drag-and-drop positions will be reset.","Please note, this category is set to automatically sort. Any drag-and-drop positions will be reset."
"Please select State/Province.","Please select State/Province."
"Please select a customer.","Please select a customer."
"Please select a store.","Please select a store."
@@ -722,6 +753,7 @@
"Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.","Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed."
"Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field.","Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field."
"Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.","Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006."
+"Please wait","Please wait"
"Please wait while the indexes are being refreshed.","Please wait while the indexes are being refreshed."
"Please wait, loading...","Please wait, loading..."
"Please wait...","Please wait..."
@@ -742,12 +774,14 @@
"Price alert subscription was saved.","Price alert subscription was saved."
"Price:","Price:"
"Processed <strong>%s%% %s/%d</strong> records","Processed <strong>%s%% %s/%d</strong> records"
+"Processing","Processing"
"Product","Product"
"Product Name","Product Name"
"Product Reviews","Product Reviews"
"Product Tax Classes","Product Tax Classes"
"Product Thumbnail Itself","Product Thumbnail Itself"
"Product is not loaded.","Product is not loaded."
+"Product not available in this website","Product not available in this website"
"Product:","Product:"
"Products","Products"
"Products Bestsellers Report","Products Bestsellers Report"
@@ -857,6 +891,8 @@
"Search Index","Search Index"
"Search Term","Search Term"
"Search Terms","Search Terms"
+"Search entire store here...","Search entire store here..."
+"Searching...","Searching..."
"Select","Select"
"Select All","Select All"
"Select Category","Select Category"
@@ -895,12 +931,14 @@
"Some items in this order have different invoice and shipment types. You can create shipment only after the invoice is created.","Some items in this order have different invoice and shipment types. You can create shipment only after the invoice is created."
"Some of the ordered items do not exist in the catalog anymore and will be removed if you try to edit the order.","Some of the ordered items do not exist in the catalog anymore and will be removed if you try to edit the order."
"Sorry, this feature is coming soon...","Sorry, this feature is coming soon..."
+"Sort options","Sort options"
"Special Price:","Special Price:"
"Specific Countries","Specific Countries"
"Specified","Specified"
"Specified profile does not exist.","Specified profile does not exist."
"Spreadsheet Name:","Spreadsheet Name:"
"Start Date","Start Date"
+"Starting at:","Starting at:"
"Starting profile execution, please wait...","Starting profile execution, please wait..."
"State/Province:","State/Province:"
"Static Blocks","Static Blocks"
@@ -912,12 +950,18 @@
"Store Email Addresses Section","Store Email Addresses Section"
"Store View","Store View"
"Store:","Store:"
+"Storefronts : ","Storefronts : "
"Stores","Stores"
"Subject","Subject"
"Submit","Submit"
"Subpackage cannot be conflicting.","Subpackage cannot be conflicting."
"Subtotal","Subtotal"
+"Switch/Solo card issue number: %s","Switch/Solo card issue number: %s"
+"Switch/Solo card start Date: %s/%s","Switch/Solo card start Date: %s/%s"
"Switch/Solo/Maestro Only","Switch/Solo/Maestro Only"
+"Switch/Solo/Maestro(UK Domestic) Only","Switch/Solo/Maestro(UK Domestic) Only"
+"Switch/Solo/Maestro(UK Domestic) card issue number: %s","Switch/Solo/Maestro(UK Domestic) card issue number: %s"
+"Switch/Solo/Maestro(UK Domestic) card start Date: %s/%s","Switch/Solo/Maestro(UK Domestic) card start Date: %s/%s"
"Symbol","Symbol"
"Synchronization is required.","Synchronization is required."
"Synchronization of media storages has been successfully completed.","Synchronization of media storages has been successfully completed."
@@ -1025,6 +1069,7 @@
"This action cannot be undone.","This action cannot be undone."
"This attribute set does not have attributes which we can use for configurable product","This attribute set does not have attributes which we can use for configurable product"
"This attribute shares the same value in all the stores","This attribute shares the same value in all the stores"
+"This category is set to only include products matched by rules","This category is set to only include products matched by rules"
"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","This is a demo store. Any orders placed through this store will not be honored or fulfilled."
"This is a required field.","This is a required field."
"This product is currently disabled.","This product is currently disabled."
@@ -1076,6 +1121,7 @@
"Unable to initialize import model","Unable to initialize import model"
"Unable to refresh lifetime statistics.","Unable to refresh lifetime statistics."
"Unable to refresh recent statistics.","Unable to refresh recent statistics."
+"Unable to save Cron expression","Unable to save Cron expression"
"Unable to save the cron expression.","Unable to save the cron expression."
"Unable to save the invoice.","Unable to save the invoice."
"Unable to send the invoice email.","Unable to send the invoice email."
@@ -1116,6 +1162,7 @@
"User Type Resources","User Type Resources"
"User name","User name"
"Users","Users"
+"Utilities","Utilities"
"VAT Number is Invalid","VAT Number is Invalid"
"VAT Number is Valid","VAT Number is Valid"
"Validation Results","Validation Results"
diff -ruN app/locale/en_US/Mage_Catalog.csv app/locale/en_US/Mage_Catalog.csv
--- app/locale/en_US/Mage_Catalog.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Catalog.csv 2015-08-03 12:35:02.000000000 +0200
@@ -58,6 +58,7 @@
"Allow HTML Tags on Frontend","Allow HTML Tags on Frontend"
"Allowed File Extensions","Allowed File Extensions"
"Allowed file extensions to upload","Allowed file extensions to upload"
+"Amount","Amount"
"An error occurred while adding products to websites.","An error occurred while adding products to websites."
"An error occurred while clearing comparison list.","An error occurred while clearing comparison list."
"An error occurred while deleting this review.","An error occurred while deleting this review."
@@ -267,6 +268,7 @@
"Double click on above image to view full picture","Double click on above image to view full picture"
"Downloadable Information","Downloadable Information"
"Duplicate","Duplicate"
+"Duplicate amount found.","Duplicate amount found."
"Duplicate website group price customer group.","Duplicate website group price customer group."
"Duplicate website tier price customer group and quantity.","Duplicate website tier price customer group and quantity."
"Duplicate website, country and state tax found.","Duplicate website, country and state tax found."
@@ -417,6 +419,7 @@
"More Views","More Views"
"Move","Move"
"Move category in tree","Move category in tree"
+"Multi update product","Multi update product"
"Must be in the allowed values list.","Must be in the allowed values list."
"My Account","My Account"
"N/A","N/A"
@@ -471,11 +474,14 @@
"Please click on the Close Window button if it is not closed automatically.","Please click on the Close Window button if it is not closed automatically."
"Please enter a new group name","Please enter a new group name"
"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -&gt; <a href=""%s"">Index Management</a>","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -&gt; <a href=""%s"">Index Management</a>"
+"Please refresh ""Product Attributes"" in System -&gt; <a href=""%s"">Index Management</a>","Please refresh ""Product Attributes"" in System -&gt; <a href=""%s"">Index Management</a>"
"Please select a static block ...","Please select a static block ..."
"Please select items.","Please select items."
"Please select one or more attributes.","Please select one or more attributes."
"Please select product(s).","Please select product(s)."
"Please select products for attributes update","Please select products for attributes update"
+"Please set up merge date/time","Please set up merge date/time"
+"Please set up merge date/time later then present date","Please set up merge date/time later then present date"
"Please specify date required option(s).","Please specify date required option(s)."
"Please specify the number of products, that will not be divided into subintervals.","Please specify the number of products, that will not be divided into subintervals."
"Please specify the product required option(s)","Please specify the product required option(s)"
@@ -621,6 +627,7 @@
"Search Information","Search Information"
"Search Query","Search Query"
"Search Term with such search query already exists.","Search Term with such search query already exists."
+"Search Weight","Search Weight"
"Searchable","Searchable"
"See price before order confirmation.","See price before order confirmation."
"Select Category...","Select Category..."
@@ -740,6 +747,7 @@
"Top/Left","Top/Left"
"Top/Right","Top/Right"
"Total Qty Base Items","Total Qty Base Items"
+"Total Qty Content Items","Total Qty Content Items"
"Total incl. Tax: %1$s","Total incl. Tax: %1$s"
"Total of %d record(s) have been deleted.","Total of %d record(s) have been deleted."
"Total of %d record(s) have been updated.","Total of %d record(s) have been updated."
@@ -809,6 +817,8 @@
"Watermark Position","Watermark Position"
"We Also Recommend","We Also Recommend"
"Website","Website"
+"Website Item Must be checked","Website Item Must be checked"
+"Website Store Must be checked","Website Store Must be checked"
"Websites","Websites"
"What's this?","What's this?"
"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","Whether to show ""All"" option in the ""Show X Per Page"" dropdown."
diff -ruN app/locale/en_US/Mage_CatalogRule.csv app/locale/en_US/Mage_CatalogRule.csv
--- app/locale/en_US/Mage_CatalogRule.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_CatalogRule.csv 2015-08-03 12:35:02.000000000 +0200
@@ -26,6 +26,7 @@
"Edit Rule","Edit Rule"
"Edit Rule '%s'","Edit Rule '%s'"
"Enable Discount to Subproducts","Enable Discount to Subproducts"
+"Expiration Date","Expiration Date"
"From Date","From Date"
"General Information","General Information"
"ID","ID"
@@ -40,16 +41,19 @@
"Rule Name","Rule Name"
"Save and Apply","Save and Apply"
"Save and Continue Edit","Save and Continue Edit"
+"Start Date","Start Date"
"Status","Status"
"Stop Further Rules Processing","Stop Further Rules Processing"
"The rule has been deleted.","The rule has been deleted."
"The rule has been saved.","The rule has been saved."
"The rules have been applied.","The rules have been applied."
+"There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","There are rules that have been changed but were not applied. Only users with exclusive access can apply rules."
"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog."
"This rule no longer exists.","This rule no longer exists."
"To Date","To Date"
"To Fixed Amount","To Fixed Amount"
"To Percentage of the Original Price","To Percentage of the Original Price"
+"Type","Type"
"Unable to apply rules.","Unable to apply rules."
"Unable to find a rule to delete.","Unable to find a rule to delete."
"Update Prices Using the Following Information","Update Prices Using the Following Information"
diff -ruN app/locale/en_US/Mage_Checkout.csv app/locale/en_US/Mage_Checkout.csv
--- app/locale/en_US/Mage_Checkout.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Checkout.csv 2015-08-03 12:35:02.000000000 +0200
@@ -185,6 +185,7 @@
"My Cart","My Cart"
"My Cart (%s item)","My Cart (%s item)"
"My Cart (%s items)","My Cart (%s items)"
+"My Cart Extra Actions","My Cart Extra Actions"
"My Cart Link","My Cart Link"
"New Address","New Address"
"New Condition","New Condition"
diff -ruN app/locale/en_US/Mage_Cron.csv app/locale/en_US/Mage_Cron.csv
--- app/locale/en_US/Mage_Cron.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Cron.csv 2015-08-03 12:35:02.000000000 +0200
@@ -1,16 +1,24 @@
+"10 minutes","10 minutes"
+"15 minutes","15 minutes"
+"20 minutes","20 minutes"
+"30 minutes","30 minutes"
+"5 minutes","5 minutes"
"Cron (Scheduled Tasks) - all the times are in minutes","Cron (Scheduled Tasks) - all the times are in minutes"
"Daily","Daily"
"Failure History Lifetime","Failure History Lifetime"
"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set."
"Generate Schedules Every","Generate Schedules Every"
"History Cleanup Every","History Cleanup Every"
+"Hourly","Hourly"
"Invalid callback: %s::%s does not exist","Invalid callback: %s::%s does not exist"
"Invalid model/method definition, expecting ""model/class::method"".","Invalid model/method definition, expecting ""model/class::method""."
+"Minute Intervals","Minute Intervals"
"Missed if Not Run Within","Missed if Not Run Within"
"Monthly","Monthly"
"No callbacks found","No callbacks found"
"Schedule Ahead for","Schedule Ahead for"
"Success History Lifetime","Success History Lifetime"
"Too late for the schedule.","Too late for the schedule."
+"Unable to delete the cron task.","Unable to delete the cron task."
"Unable to save the cron expression.","Unable to save the cron expression."
"Weekly","Weekly"
diff -ruN app/locale/en_US/Mage_Customer.csv app/locale/en_US/Mage_Customer.csv
--- app/locale/en_US/Mage_Customer.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Customer.csv 2015-08-03 12:35:02.000000000 +0200
@@ -1,3 +1,4 @@
+" or "," or "
"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' appears to be a DNS hostname but cannot extract TLD part"
"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' appears to be a DNS hostname but cannot match TLD against known list"
"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'"
@@ -413,6 +414,7 @@
"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","To show VAT number on frontend, set Show VAT Number on Frontend option to Yes."
"Total","Total"
"Type","Type"
+"Unable to save the customer.","Unable to save the customer."
"Unknown","Unknown"
"Unsubscribe from Newsletter","Unsubscribe from Newsletter"
"Update","Update"
@@ -469,3 +471,4 @@
"Zip/Postal Code","Zip/Postal Code"
"n/a","n/a"
"or","or"
+"register","register"
diff -ruN app/locale/en_US/Mage_Dataflow.csv app/locale/en_US/Mage_Dataflow.csv
--- app/locale/en_US/Mage_Dataflow.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Dataflow.csv 2015-08-03 12:35:02.000000000 +0200
@@ -14,9 +14,11 @@
"Found %d rows.","Found %d rows."
"Less than a minute","Less than a minute"
"Loaded successfully: ""%s"".","Loaded successfully: ""%s""."
+"Memory Used: %s","Memory Used: %s"
"Method ""%s"" not defined in adapter %s.","Method ""%s"" not defined in adapter %s."
"Method ""%s"" was not defined in adapter %s.","Method ""%s"" was not defined in adapter %s."
"Please declare ""adapter"" and ""method"" nodes first.","Please declare ""adapter"" and ""method"" nodes first."
+"Processed records: %s","Processed records: %s"
"Profile with the same name already exists.","Profile with the same name already exists."
"Saved successfully: ""%s"" [%d byte(s)].","Saved successfully: ""%s"" [%d byte(s)]."
"Sheet 1","Sheet 1"
diff -ruN app/locale/en_US/Mage_Directory.csv app/locale/en_US/Mage_Directory.csv
--- app/locale/en_US/Mage_Directory.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Directory.csv 2015-08-03 12:35:02.000000000 +0200
@@ -39,6 +39,7 @@
"State is required for","State is required for"
"State/Province","State/Province"
"States Options","States Options"
+"Strikeiron Email Update Warnings","Strikeiron Email Update Warnings"
"Unable to initialize the import model.","Unable to initialize the import model."
"Undefined rate from ""%s-%s"".","Undefined rate from ""%s-%s""."
"WARNING:","WARNING:"
diff -ruN app/locale/en_US/Mage_Log.csv app/locale/en_US/Mage_Log.csv
--- app/locale/en_US/Mage_Log.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Log.csv 2015-08-03 12:35:02.000000000 +0200
@@ -5,6 +5,7 @@
"Error Email Template","Error Email Template"
"Frequency","Frequency"
"Log","Log"
+"Log Cleaning","Log Cleaning"
"Log cleanup Warnings","Log cleanup Warnings"
"Save Log, Days","Save Log, Days"
"Start Time","Start Time"
diff -ruN app/locale/en_US/Mage_PageCache.csv app/locale/en_US/Mage_PageCache.csv
--- app/locale/en_US/Mage_PageCache.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_PageCache.csv 2015-08-03 12:35:02.000000000 +0200
@@ -3,6 +3,7 @@
"Enable External Cache","Enable External Cache"
"External Cache Control","External Cache Control"
"External Full Page Cache Settings","External Full Page Cache Settings"
+"External Page Cache","External Page Cache"
"External full page cache.","External full page cache."
"Failed to load external cache control","Failed to load external cache control"
"Flush External Page Cache","Flush External Page Cache"
diff -ruN app/locale/en_US/Mage_Page.csv app/locale/en_US/Mage_Page.csv
--- app/locale/en_US/Mage_Page.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Page.csv 2015-08-03 12:35:02.000000000 +0200
@@ -1,5 +1,6 @@
"%s Item(s)","%s Item(s)"
"%s-%s of %s","%s-%s of %s"
+"&copy; 2013 Magento Demo Store. All Rights Reserved.","&copy; 2013 Magento Demo Store. All Rights Reserved."
"&copy; 2015 Magento Demo Store. All Rights Reserved.","&copy; 2015 Magento Demo Store. All Rights Reserved."
"(Shift-)Click or drag to change value","(Shift-)Click or drag to change value"
"(ver. %s)","(ver. %s)"
diff -ruN app/locale/en_US/Mage_Payment.csv app/locale/en_US/Mage_Payment.csv
--- app/locale/en_US/Mage_Payment.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Payment.csv 2015-08-03 12:35:02.000000000 +0200
@@ -28,7 +28,9 @@
"Centinel API URL","Centinel API URL"
"Check / Money Order","Check / Money Order"
"Credit Card Number","Credit Card Number"
+"Credit Card Number: xxxx-%s","Credit Card Number: xxxx-%s"
"Credit Card Type","Credit Card Type"
+"Credit Card Type: %s","Credit Card Type: %s"
"Credit Card Types","Credit Card Types"
"Credit card number mismatch with credit card type.","Credit card number mismatch with credit card type."
"Credit card type is not allowed for this payment method.","Credit card type is not allowed for this payment method."
@@ -39,6 +41,7 @@
"Debug Mode","Debug Mode"
"Enabled","Enabled"
"Expiration Date","Expiration Date"
+"Expiration Date: %s/%s","Expiration Date: %s/%s"
"Full name of the person receiving the product or service paid for by the recurring payment.","Full name of the person receiving the product or service paid for by the recurring payment."
"Incorrect credit card expiration date.","Incorrect credit card expiration date."
"Initial Fee","Initial Fee"
@@ -60,11 +63,13 @@
"N/A","N/A"
"Name on Card","Name on Card"
"Name on the Card","Name on the Card"
+"Name on the Card: %s","Name on the Card: %s"
"New Order Status","New Order Status"
"Number of billing periods that make up one billing cycle.","Number of billing periods that make up one billing cycle."
"Order action is not available.","Order action is not available."
"Overrides API URL that may be specified by a payment method.","Overrides API URL that may be specified by a payment method."
"Password","Password"
+"Payment ID: %s","Payment ID: %s"
"Payment Method","Payment Method"
"Payment Methods","Payment Methods"
"Payment Methods Section","Payment Methods Section"
diff -ruN app/locale/en_US/Mage_Paypal.csv app/locale/en_US/Mage_Paypal.csv
--- app/locale/en_US/Mage_Paypal.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Paypal.csv 2015-08-03 12:35:02.000000000 +0200
@@ -124,7 +124,9 @@
"Authenticated, Good Result","Authenticated, Good Result"
"Authorization","Authorization"
"Authorization Honor Period (days)","Authorization Honor Period (days)"
+"Authorization expired.","Authorization expired."
"Authorization transaction is required to void.","Authorization transaction is required to void."
+"Authorization was voided by merchant.","Authorization was voided by merchant."
"Authorized amount of %s.","Authorized amount of %s."
"Authorizing amount of %s is pending approval on gateway.","Authorizing amount of %s is pending approval on gateway."
"Auto","Auto"
@@ -184,6 +186,7 @@
"Configure","Configure"
"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site.","Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site."
"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.","Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site."
+"Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?","Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?"
"Continue","Continue"
"Countries Payment Applicable From","Countries Payment Applicable From"
"Country","Country"
@@ -195,6 +198,8 @@
"Custom Endpoint Hostname or IP-Address","Custom Endpoint Hostname or IP-Address"
"Custom Path","Custom Path"
"Customer did not include a confirmed address.","Customer did not include a confirmed address."
+"Customer failed to pay.","Customer failed to pay."
+"Customer used non-confirmed address.","Customer used non-confirmed address."
"Daily","Daily"
"Debit","Debit"
"Debit Card Cash Back","Debit Card Cash Back"
@@ -237,6 +242,7 @@
"Exact Match. Address and Postal Code. International","Exact Match. Address and Postal Code. International"
"Exact Match. Address and Postal Code. UK-specific","Exact Match. Address and Postal Code. UK-specific"
"Exact Match. Address and nine-digit ZIP code","Exact Match. Address and nine-digit ZIP code"
+"Explanation: %s.","Explanation: %s."
"Express Checkout","Express Checkout"
"Express Checkout APIs","Express Checkout APIs"
"Express Checkout and Order have been canceled.","Express Checkout and Order have been canceled."
@@ -295,6 +301,7 @@
"IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s""","IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s"""
"IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s.","IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s."
"IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s","IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s"
+"IPN verification ""%s"".","IPN verification ""%s""."
"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement."
"If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."
@@ -326,11 +333,16 @@
"Merchant Location","Merchant Location"
"Merchant Protection Eligibility","Merchant Protection Eligibility"
"Merchant Referral Bonus","Merchant Referral Bonus"
+"Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview."
+"Merchant account is not verified.","Merchant account is not verified."
+"Merchant denied this pending payment.","Merchant denied this pending payment."
"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","Merchant holds a non-U.S. account and does not have a withdrawal mechanism."
+"Merchant must upgrade account to Business or Premier status.","Merchant must upgrade account to Business or Premier status."
"Merchant reference ID format is not supported.","Merchant reference ID format is not supported."
"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account."
"Mobile Optimized","Mobile Optimized"
"Mobile Payment (made via a mobile phone)","Mobile Payment (made via a mobile phone)"
+"Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview."
"N/A","N/A"
"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Address not checked, or acquirer had no response. Service not available"
"N/A. Global Unavailable","N/A. Global Unavailable"
@@ -432,7 +444,9 @@
"Payment Method","Payment Method"
"Payment Refund initiated by merchant","Payment Refund initiated by merchant"
"Payment has been declined. Please try again.","Payment has been declined. Please try again."
+"Payment is being reviewed by PayPal for risk.","Payment is being reviewed by PayPal for risk."
"Payment transactions disallow storing objects.","Payment transactions disallow storing objects."
+"Payment was made to an email address that is not yet registered or confirmed.","Payment was made to an email address that is not yet registered or confirmed."
"Payments Advanced","Payments Advanced"
"Payments Advanced (Includes Express Checkout)","Payments Advanced (Includes Express Checkout)"
"Payments Pro (Includes Express Checkout)","Payments Pro (Includes Express Checkout)"
@@ -445,6 +459,7 @@
"Pending PayPal","Pending PayPal"
"Place Order","Place Order"
"Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order."
+"Please contact PayPal Customer Service.","Please contact PayPal Customer Service."
"Please do not refresh the page until you complete payment.","Please do not refresh the page until you complete payment."
"Please re-enable the previously enabled payment solutions.","Please re-enable the previously enabled payment solutions."
"Please select a shipping method...","Please select a shipping method..."
@@ -471,6 +486,7 @@
"Reimbursement of Chargeback","Reimbursement of Chargeback"
"Report Date","Report Date"
"Reports","Reports"
+"Requested %s and configured %s merchant emails do not match.","Requested %s and configured %s merchant emails do not match."
"Require CVV Entry","Require CVV Entry"
"Require Customer's Billing Address","Require Customer's Billing Address"
"Required PayPal Settings","Required PayPal Settings"
@@ -589,6 +605,7 @@
"Virtual PayPal Debit Card Transaction","Virtual PayPal Debit Card Transaction"
"Virtual Terminal Payment","Virtual Terminal Payment"
"Void","Void"
+"Waiting until Customer\'s eCheck will be cleared.","Waiting until Customer\'s eCheck will be cleared."
"We prefer PayPal (150 X 40)","We prefer PayPal (150 X 40)"
"We prefer PayPal (150 X 60)","We prefer PayPal (150 X 60)"
"Website Payments Plus","Website Payments Plus"
@@ -607,6 +624,7 @@
"Will appear as a payment option only for customers who have at least one active billing agreement.","Will appear as a payment option only for customers who have at least one active billing agreement."
"WorldLink Withdrawal","WorldLink Withdrawal"
"Would you like to sign a billing agreement to streamline further purchases with PayPal?","Would you like to sign a billing agreement to streamline further purchases with PayPal?"
+"Wrong Order ID (%s) specified.","Wrong Order ID (%s) specified."
"Wrong PayPal Express Checkout Token specified.","Wrong PayPal Express Checkout Token specified."
"Yes","Yes"
"Yes (PayPal recommends this option)","Yes (PayPal recommends this option)"
@@ -617,4 +635,13 @@
"You will be redirected to the PayPal website.","You will be redirected to the PayPal website."
"You will be required to enter your payment details after you place an order.","You will be required to enter your payment details after you place an order."
"Zip/Postal Code","Zip/Postal Code"
+"chargeback reimbursed","chargeback reimbursed"
+"chargeback settled","chargeback settled"
+"customer complaint","customer complaint"
+"customer triggered a chargeback","customer triggered a chargeback"
+"customer triggered money-back guarantee","customer triggered money-back guarantee"
"eBay Auction Payment","eBay Auction Payment"
+"merchant refunded payment","merchant refunded payment"
+"no reason","no reason"
+"reversal of an adjustment","reversal of an adjustment"
+"unknown reason","unknown reason"
diff -ruN app/locale/en_US/Mage_Review.csv app/locale/en_US/Mage_Review.csv
--- app/locale/en_US/Mage_Review.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Review.csv 2015-08-03 12:35:02.000000000 +0200
@@ -10,6 +10,7 @@
"4 stars","4 stars"
"5 star","5 star"
"5 stars","5 stars"
+"<a href=""%1$s"" onclick=""this.target=\'blank\'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>","<a href=""%1$s"" onclick=""this.target=\'blank\'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>"
"<a href=""%1$s"" onclick=""this.target=\'blank\'"">%2$s</a> <a href=""mailto:%3$s"">(%3$s)</a>","<a href=""%1$s"" onclick=""this.target=\'blank\'"">%2$s</a> <a href=""mailto:%3$s"">(%3$s)</a>"
"Add New Review","Add New Review"
"Add Your Review","Add Your Review"
diff -ruN app/locale/en_US/Mage_Rule.csv app/locale/en_US/Mage_Rule.csv
--- app/locale/en_US/Mage_Rule.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Rule.csv 2015-08-03 12:35:02.000000000 +0200
@@ -19,12 +19,22 @@
"by","by"
"contains","contains"
"does not contain","does not contain"
+"does not contains","does not contains"
"equals or greater than","equals or greater than"
"equals or less than","equals or less than"
+"for","for"
+"for greater than","for greater than"
+"for or greater than","for or greater than"
+"found","found"
+"from","from"
"greater than","greater than"
"is","is"
"is not","is not"
"is not one of","is not one of"
"is one of","is one of"
"less than","less than"
+"not found","not found"
+"not from","not from"
"to","to"
+"was","was"
+"was not","was not"
diff -ruN app/locale/en_US/Mage_Sales.csv app/locale/en_US/Mage_Sales.csv
--- app/locale/en_US/Mage_Sales.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Sales.csv 2015-08-03 12:35:02.000000000 +0200
@@ -155,6 +155,7 @@
"Create New Order for New Customer","Create New Order for New Customer"
"Create New Order for New Customer in %s","Create New Order for New Customer in %s"
"Create New Status","Create New Status"
+"Create Order","Create Order"
"Create Packages","Create Packages"
"Create Shipment","Create Shipment"
"Create Shipping Label","Create Shipping Label"
@@ -259,6 +260,7 @@
"Gift Message for the Entire Order","Gift Message for the Entire Order"
"Gift Message for this Order","Gift Message for this Order"
"Gift Options","Gift Options"
+"Gift Wrapping for the Entire Order","Gift Wrapping for the Entire Order"
"Girth","Girth"
"Go to Home Page","Go to Home Page"
"Grand Total","Grand Total"
@@ -776,6 +778,7 @@
"There is no update for the payment.","There is no update for the payment."
"This message will be shown in shopping cart when subtotal after discount less than minimum amount.","This message will be shown in shopping cart when subtotal after discount less than minimum amount."
"This operation requires an existing transaction object.","This operation requires an existing transaction object."
+"This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed."
"This order no longer exists.","This order no longer exists."
"This product does not have any configurable options","This product does not have any configurable options"
"This profile state cannot be changed to ""%s"".","This profile state cannot be changed to ""%s""."
diff -ruN app/locale/en_US/Mage_Shipping.csv app/locale/en_US/Mage_Shipping.csv
--- app/locale/en_US/Mage_Shipping.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Shipping.csv 2015-08-03 12:35:02.000000000 +0200
@@ -9,6 +9,7 @@
"Close Window","Close Window"
"Condition","Condition"
"Country","Country"
+"Custom Value","Custom Value"
"Date","Date"
"Delivered on:","Delivered on:"
"Delivered to:","Delivered to:"
diff -ruN app/locale/en_US/Mage_Weee.csv app/locale/en_US/Mage_Weee.csv
--- app/locale/en_US/Mage_Weee.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Weee.csv 2015-08-03 12:35:02.000000000 +0200
@@ -21,3 +21,4 @@
"Total Incl. Tax","Total Incl. Tax"
"Total excl. tax","Total excl. tax"
"Total incl. tax","Total incl. tax"
+"Total:","Total:"
diff -ruN app/locale/en_US/Mage_Wishlist.csv app/locale/en_US/Mage_Wishlist.csv
--- app/locale/en_US/Mage_Wishlist.csv 2015-06-26 10:53:38.000000000 +0200
+++ app/locale/en_US/Mage_Wishlist.csv 2015-08-03 12:35:02.000000000 +0200
@@ -22,6 +22,7 @@
"Can\'t save description %s","Can\'t save description %s"
"Can\'t update wishlist","Can\'t update wishlist"
"Cannot add item to shopping cart","Cannot add item to shopping cart"
+"Cannot add the following product(s) to shopping cart: %s.","Cannot add the following product(s) to shopping cart: %s."
"Cannot add the item to shopping cart.","Cannot add the item to shopping cart."
"Cannot add the selected product to shopping cart because the product was removed from the wishlist","Cannot add the selected product to shopping cart because the product was removed from the wishlist"
"Cannot configure product","Cannot configure product"
@@ -37,6 +38,7 @@
"Comment:","Comment:"
"Configure Wishlist Item","Configure Wishlist Item"
"Configured Price:","Configured Price:"
+"Could not find such wishlist","Could not find such wishlist"
"Could not find wishlist","Could not find wishlist"
"Customer My Account My Wishlist","Customer My Account My Wishlist"
"Customer My Account Wishlist Sharing Form","Customer My Account Wishlist Sharing Form"
@@ -70,6 +72,7 @@
"Product","Product"
"Product Details and Comment","Product Details and Comment"
"Product(s) %s have required options. Each of them can be added to cart separately only.","Product(s) %s have required options. Each of them can be added to cart separately only."
+"Product(s) %s have required options. Each product can only be added individually.","Product(s) %s have required options. Each product can only be added individually."
"Qty","Qty"
"RSS Feed","RSS Feed"
"RSS link to %s's wishlist","RSS link to %s's wishlist"
diff -ruN app/Mage.php app/Mage.php
--- app/Mage.php 2015-06-26 10:53:38.000000000 +0200
+++ app/Mage.php 2015-08-03 12:35:02.000000000 +0200
@@ -171,7 +171,7 @@
'major' => '1',
'minor' => '9',
'revision' => '2',
- 'patch' => '0',
+ 'patch' => '1',
'stability' => '',
'number' => '',
);
diff -ruN dev/tests/functional/composer.json dev/tests/functional/composer.json
--- dev/tests/functional/composer.json 2015-06-26 10:53:36.000000000 +0200
+++ dev/tests/functional/composer.json 2015-08-03 12:35:00.000000000 +0200
@@ -20,6 +20,7 @@
"psr-4": {
"Magento\\": ["lib/Magento/", "vendor/magento/mtf/Magento/", "testsuites/Magento/"],
"Mage\\": ["generated/Mage/", "tests/app/Mage/"],
+ "Enterprise\\": ["generated/Enterprise/", "tests/app/Enterprise/"],
"Test\\": "generated/Test/"
}
}
diff -ruN dev/tests/functional/tests/app/Mage/Admin/Test/Fixture/Role/RolesResources.php dev/tests/functional/tests/app/Mage/Admin/Test/Fixture/Role/RolesResources.php
--- dev/tests/functional/tests/app/Mage/Admin/Test/Fixture/Role/RolesResources.php 2015-06-26 10:53:36.000000000 +0200
+++ dev/tests/functional/tests/app/Mage/Admin/Test/Fixture/Role/RolesResources.php 2015-08-03 12:35:00.000000000 +0200
@@ -134,6 +134,9 @@
'sales/order/actions/create/reward_spend',
'sales/invoice',
'sales/shipment',
+ 'sales/enterprise_rma',
+ 'sales/enterprise_rma/rma_manage',
+ 'sales/enterprise_rma/rma_attribute',
'sales/creditmemo',
'sales/checkoutagreement',
'sales/transactions',
@@ -144,6 +147,10 @@
'sales/billing_agreement/actions/view',
'sales/billing_agreement/actions/manage',
'sales/billing_agreement/actions/use',
+ 'sales/enterprise_checkout',
+ 'sales/enterprise_checkout/view',
+ 'sales/enterprise_checkout/update',
+ 'sales/enterprise_giftwrapping',
'sales/tax',
'sales/tax/classes_customer',
'sales/tax/classes_product',
diff -ruN dev/tests/functional/tests/app/Mage/Adminhtml/Test/TestCase/CreateStoreEntityTest.php dev/tests/functional/tests/app/Mage/Adminhtml/Test/TestCase/CreateStoreEntityTest.php
--- dev/tests/functional/tests/app/Mage/Adminhtml/Test/TestCase/CreateStoreEntityTest.php 1970-01-01 01:00:00.000000000 +0100
+++ dev/tests/functional/tests/app/Mage/Adminhtml/Test/TestCase/CreateStoreEntityTest.php 2015-08-03 12:35:00.000000000 +0200
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category Tests
+ * @package Tests_Functional
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Mage\Adminhtml\Test\TestCase;
+
+use Magento\Mtf\TestCase\Injectable;
+use Mage\Core\Test\Fixture\ConfigData;
+use Mage\Adminhtml\Test\Fixture\Store;
+use Mage\Adminhtml\Test\Page\Adminhtml\StoreIndex;
+use Mage\Adminhtml\Test\Page\Adminhtml\StoreNew;
+use Mage\Adminhtml\Test\Page\Adminhtml\EditStore;
+use Mage\Adminhtml\Test\Page\Adminhtml\DeleteStore;
+use Mage\Adminhtml\Test\Page\Adminhtml\EditGroup;
+use Mage\Adminhtml\Test\Page\Adminhtml\DeleteGroup;
+use Mage\Adminhtml\Test\Page\AdminLogout;
+
+/**
+ * Test Creation for CreateStoreEntity (Store Management)
+ *
+ * Steps:
+ * 1. Open Backend
+ * 2. Go to System -> Manage Stores
+ * 3. Click "Create Store View" button
+ * 4. Fill data according to dataset
+ * 5. Perform all assertions
+ *
+ * @group Store_Management_(MX)
+ * @ZephyrId MPERF-6650
+ */
+class CreateStoreEntityTest extends Injectable
+{
+ /**
+ * Page StoreIndex.
+ *
+ * @var StoreIndex
+ */
+ protected $storeIndex;
+
+ /**
+ * Page StoreNew.
+ *
+ * @var StoreNew
+ */
+ protected $storeNew;
+
+ /**
+ * Current Store View.
+ *
+ * @var Store
+ */
+ protected $store;
+
+ /**
+ * Page EditStore.
+ *
+ * @var EditStore
+ */
+ protected $editStore;
+
+ /**
+ * Page DeleteStore.
+ *
+ * @var DeleteStore
+ */
+ protected $deleteStore;
+
+ /**
+ * Page EditGroup.
+ *
+ * @var EditGroup
+ */
+ protected $editGroup;
+
+ /**
+ * Page DeleteGroup.
+ *
+ * @var DeleteGroup
+ */
+ protected $deleteGroup;
+
+ /**
+ * Admin logout page.
+ *
+ * @var AdminLogout
+ */
+ protected $adminLogout;
+
+ /**
+ * Preparing pages for test.
+ *
+ * @param StoreIndex $storeIndex
+ * @param StoreNew $storeNew
+ * @param EditStore $editStore
+ * @param DeleteStore $deleteStore
+ * @param EditGroup $editGroup
+ * @param DeleteGroup $deleteGroup
+ * @param AdminLogout $adminLogout
+ * @return void
+ */
+ public function __inject(
+ StoreIndex $storeIndex,
+ StoreNew $storeNew,
+ EditStore $editStore,
+ DeleteStore $deleteStore,
+ EditGroup $editGroup,
+ DeleteGroup $deleteGroup,
+ AdminLogout $adminLogout
+ ) {
+ $this->storeIndex = $storeIndex;
+ $this->storeNew = $storeNew;
+ $this->editStore = $editStore;
+ $this->deleteStore = $deleteStore;
+ $this->editGroup = $editGroup;
+ $this->deleteGroup = $deleteGroup;
+ $this->adminLogout = $adminLogout;
+ }
+
+ /**
+ * Run CreateStoreEntity test.
+ *
+ * @param Store $store
+ * @param ConfigData $config
+ * @return void
+ */
+ public function test(Store $store, ConfigData $config)
+ {
+ // Preconditions
+ $this->store = $store;
+ $config->persist();
+ $this->adminLogout->open();
+
+ // Steps
+ $this->storeIndex->open();
+ $this->storeIndex->getGridPageActions()->addStoreView();
+ $this->storeNew->getStoreForm()->fill($store);
+ $this->storeNew->getFormPageActions()->save();
+ }
+
+ /**
+ * Delete store.
+ *
+ * @return void
+ */
+ public function tearDown()
+ {
+ $this->objectManager->create(
+ 'Mage\Core\Test\TestStep\SetupConfigurationStep',
+ ['configData' => 'store_view_local', 'rollback' => true]
+ )->run();
+ $this->storeIndex->open();
+ if ($this->store->getGroupId() === 'Main Website/Main Website Store') {
+ $this->storeIndex->getStoreGrid()->openStore($this->store);
+ $this->editStore->getFormPageActions()->delete();
+ $this->deleteStore->getFormPageActions()->delete();
+ } else {
+ $this->storeIndex->getStoreGrid()->openStoreGroup(explode('/', $this->store->getGroupId())[1]);
+ $this->editGroup->getFormPageActions()->delete();
+ $this->deleteGroup->getFormPageActions()->delete();
+ }
+ }
+}
diff -ruN dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/AddProductsToMultipleWishListTest.xml dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/AddProductsToMultipleWishListTest.xml
--- dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/AddProductsToMultipleWishListTest.xml 1970-01-01 01:00:00.000000000 +0100
+++ dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/AddProductsToMultipleWishListTest.xml 2015-08-03 12:35:00.000000000 +0200
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category Tests
+ * @package Tests_Functional
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+ <testCase name="Enterprise\Wishlist\Test\TestCase\AddProductsToMultipleWishListTest">
+ <variation name="AddProductsToMultipleWishListTestVariation6">
+ <data name="multipleWishlist/dataSet" xsi:type="string">wishlist_public</data>
+ <data name="products" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
+ <data name="duplicate/0" xsi:type="boolean">false</data>
+ <data name="qtyToAction/0" xsi:type="string">1</data>
+ <constraint name="Mage\Wishlist\Test\Constraint\AssertAddProductsToWishlistSuccessMessage" />
+ <constraint name="Enterprise\Wishlist\Test\Constraint\AssertProductsInCustomWishlist" />
+ <constraint name="Mage\Wishlist\Test\Constraint\AssertProductsArePresentInCustomerBackendWishlist" />
+ </variation>
+ </testCase>
+</config>
diff -ruN dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/CreateRmaEntityOnBackendTest.xml dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/CreateRmaEntityOnBackendTest.xml
--- dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/CreateRmaEntityOnBackendTest.xml 1970-01-01 01:00:00.000000000 +0100
+++ dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/CreateRmaEntityOnBackendTest.xml 2015-08-03 12:35:00.000000000 +0200
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category Tests
+ * @package Tests_Functional
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+ <testCase name="Enterprise\Rma\Test\TestCase\CreateRmaEntityOnBackendTest">
+ <variation name="CreateRmaEntityOnBackendTestVariation3">
+ <data name="rma/data/order_id/dataSet" xsi:type="string">bundle_fixed</data>
+ <data name="rma/data/items/data/0/qty_requested" xsi:type="string">1</data>
+ <data name="rma/data/items/data/0/reason" xsi:type="string">Out of Service</data>
+ <data name="rma/data/items/data/0/condition" xsi:type="string">Unopened</data>
+ <data name="rma/data/items/data/0/resolution" xsi:type="string">Store Credit</data>
+ <data name="rma/data/contact_email" xsi:type="string">test%isolation%@example.com</data>
+ <data name="rma/data/comment/comment" xsi:type="string">comments %isolation%</data>
+ <data name="rma/data/comment/is_visible_on_front" xsi:type="string">Yes</data>
+ <data name="rma/data/status" xsi:type="string">Pending</data>
+ <constraint name="Enterprise\Rma\Test\Constraint\AssertRmaInGrid" />
+ <constraint name="Enterprise\Rma\Test\Constraint\AssertRmaBundleOnFrontendForCustomer" />
+ </variation>
+ </testCase>
+</config>
diff -ruN dev/tests/functional/tests/app/Mage/Checkout/Test/Fixture/Cart/Items.php dev/tests/functional/tests/app/Mage/Checkout/Test/Fixture/Cart/Items.php
--- dev/tests/functional/tests/app/Mage/Checkout/Test/Fixture/Cart/Items.php 2015-06-26 10:53:36.000000000 +0200
+++ dev/tests/functional/tests/app/Mage/Checkout/Test/Fixture/Cart/Items.php 2015-08-03 12:35:00.000000000 +0200
@@ -46,6 +46,7 @@
'simple' => 'Mage\Catalog\Test\Fixture\Cart\Item',
'configurable' => 'Mage\Catalog\Test\Fixture\ConfigurableProduct\Cart\Item',
'downloadable' => 'Mage\Downloadable\Test\Fixture\Cart\Item',
+ 'giftcard' => 'Enterprise\GiftCard\Test\Fixture\Cart\Item',
'virtual' => 'Mage\Catalog\Test\Fixture\Cart\Item',
'grouped' => 'Mage\Catalog\Test\Fixture\GroupedProduct\Cart\Item',
'bundle' => 'Mage\Bundle\Test\Fixture\Cart\Item'
diff -ruN dev/tests/functional/tests/app/Mage/Downloadable/Test/TestCase/AddProductsToMultipleWishListTest.xml dev/tests/functional/tests/app/Mage/Downloadable/Test/TestCase/AddProductsToMultipleWishListTest.xml
--- dev/tests/functional/tests/app/Mage/Downloadable/Test/TestCase/AddProductsToMultipleWishListTest.xml 1970-01-01 01:00:00.000000000 +0100
+++ dev/tests/functional/tests/app/Mage/Downloadable/Test/TestCase/AddProductsToMultipleWishListTest.xml 2015-08-03 12:35:00.000000000 +0200
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category Tests
+ * @package Tests_Functional
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+ <testCase name="Enterprise\Wishlist\Test\TestCase\AddProductsToMultipleWishListTest">
+ <variation name="AddProductsToMultipleWishListTestVariation5">
+ <data name="multipleWishlist/dataSet" xsi:type="string">wishlist_public</data>
+ <data name="products" xsi:type="string">downloadableProduct::with_two_separately_links</data>
+ <data name="duplicate/0" xsi:type="boolean">false</data>
+ <data name="qtyToAction/0" xsi:type="string">1</data>
+ <constraint name="Mage\Wishlist\Test\Constraint\AssertAddProductsToWishlistSuccessMessage" />
+ <constraint name="Enterprise\Wishlist\Test\Constraint\AssertProductsInCustomWishlist" />
+ <constraint name="Mage\Wishlist\Test\Constraint\AssertProductsArePresentInCustomerBackendWishlist" />
+ </variation>
+ </testCase>
+</config>
diff -ruN dev/tests/functional/tests/app/Mage/Paypal/Test/Block/AbstractReview.php dev/tests/functional/tests/app/Mage/Paypal/Test/Block/AbstractReview.php
--- dev/tests/functional/tests/app/Mage/Paypal/Test/Block/AbstractReview.php 2015-06-26 10:53:36.000000000 +0200
+++ dev/tests/functional/tests/app/Mage/Paypal/Test/Block/AbstractReview.php 2015-08-03 12:35:00.000000000 +0200
@@ -90,7 +90,6 @@
public function continueCheckout()
{
$this->_rootElement->find($this->continue)->click();
- $this->waitLoader();
}
/**
diff -ruN dev/tests/functional/tests/app/Mage/Paypal/Test/Block/Express/Review.php dev/tests/functional/tests/app/Mage/Paypal/Test/Block/Express/Review.php
--- dev/tests/functional/tests/app/Mage/Paypal/Test/Block/Express/Review.php 2015-06-26 10:53:36.000000000 +0200
+++ dev/tests/functional/tests/app/Mage/Paypal/Test/Block/Express/Review.php 2015-08-03 12:35:00.000000000 +0200
@@ -80,14 +80,4 @@
$this->_rootElement->find($this->shippingMethod, Locator::SELECTOR_CSS, 'optgroupselect')
->setValue($service . "/" . $method);
}
-
- /**
- * Check if 'Place Order' button is visible.
- *
- * @return bool
- */
- public function isPlaceOrderVisible()
- {
- return $this->_rootElement->find($this->placeOrder)->isVisible();
- }
}
diff -ruN dev/tests/functional/tests/app/Mage/Paypal/Test/TestCase/TestCreationForExpressCheckoutWithinPayPalButtonTest.xml dev/tests/functional/tests/app/Mage/Paypal/Test/TestCase/TestCreationForExpressCheckoutWithinPayPalButtonTest.xml
--- dev/tests/functional/tests/app/Mage/Paypal/Test/TestCase/TestCreationForExpressCheckoutWithinPayPalButtonTest.xml 2015-06-26 10:53:36.000000000 +0200
+++ dev/tests/functional/tests/app/Mage/Paypal/Test/TestCase/TestCreationForExpressCheckoutWithinPayPalButtonTest.xml 2015-08-03 12:35:00.000000000 +0200
@@ -32,7 +32,7 @@
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups</data>
<data name="configData" xsi:type="string">paypal_express_order_line_items_mark_require_billing_address</data>
<data name="shippingMethod" xsi:type="string">Flat Rate/Fixed</data>
- <data name="grandTotal" xsi:type="string">215</data>
+ <data name="grandTotal" xsi:type="string">115</data>
<data name="status" xsi:type="string">Processing</data>
<data name="transactionType" xsi:type="string">Authorization</data>
<data name="ipn" xsi:type="string">-</data>
@@ -68,7 +68,7 @@
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups</data>
<data name="configData" xsi:type="string">payflow_express_authorization_specificcountry_us</data>
<data name="shippingMethod" xsi:type="string">-</data>
- <data name="grandTotal" xsi:type="string">500</data>
+ <data name="grandTotal" xsi:type="string">400</data>
<data name="status" xsi:type="string">Processing</data>
<data name="transactionType" xsi:type="string">Authorization</data>
<data name="ipn" xsi:type="string">-</data>
@@ -106,7 +106,7 @@
<data name="salesRule" xsi:type="string">-</data>
<data name="configData" xsi:type="string">payflow_express_sale_specificcountry_gb_line_items</data>
<data name="shippingMethod" xsi:type="string">Flat Rate/Fixed</data>
- <data name="grandTotal" xsi:type="string">205</data>
+ <data name="grandTotal" xsi:type="string">105</data>
<data name="status" xsi:type="string">Processing</data>
<data name="transactionType" xsi:type="string">Authorization</data>
<data name="ipn" xsi:type="string">Completed</data>
@@ -124,7 +124,7 @@
<data name="salesRule" xsi:type="string">-</data>
<data name="configData" xsi:type="string">paypal_express_sale_specificcountry_us_shipping_options_mark</data>
<data name="shippingMethod" xsi:type="string">Flat Rate/Fixed</data>
- <data name="grandTotal" xsi:type="string">315</data>
+ <data name="grandTotal" xsi:type="string">215</data>
<data name="status" xsi:type="string">Processing</data>
<data name="transactionType" xsi:type="string">Authorization</data>
<data name="ipn" xsi:type="string">Completed</data>
@@ -142,7 +142,7 @@
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups</data>
<data name="configData" xsi:type="string">paypal_express_sale_specificcountry_us_shipping_options_mark</data>
<data name="shippingMethod" xsi:type="string">-</data>
- <data name="grandTotal" xsi:type="string">500</data>
+ <data name="grandTotal" xsi:type="string">400</data>
<data name="status" xsi:type="string">Processing</data>
<data name="transactionType" xsi:type="string">Authorization</data>
<data name="ipn" xsi:type="string">Completed</data>
diff -ruN dev/tests/functional/tests/app/Mage/Paypal/Test/TestStep/ContinuePayPalCheckoutStep.php dev/tests/functional/tests/app/Mage/Paypal/Test/TestStep/ContinuePayPalCheckoutStep.php
--- dev/tests/functional/tests/app/Mage/Paypal/Test/TestStep/ContinuePayPalCheckoutStep.php 2015-06-26 10:53:36.000000000 +0200
+++ dev/tests/functional/tests/app/Mage/Paypal/Test/TestStep/ContinuePayPalCheckoutStep.php 2015-08-03 12:35:00.000000000 +0200
@@ -29,7 +29,6 @@
use Mage\Checkout\Test\Page\CheckoutOnepageSuccess;
use Mage\Paypal\Test\Fixture\PaypalCustomer;
use Mage\Paypal\Test\Page\Paypal;
-use Mage\Paypal\Test\Page\PaypalExpressReview;
use Magento\Mtf\TestStep\TestStepInterface;
use Mage\Paypal\Test\Block\AbstractReview;
@@ -53,13 +52,6 @@
protected $checkoutOnepageSuccess;
/**
- * Pay Pal express review page.
- *
- * @var PaypalExpressReview
- */
- protected $paypalExpressReview;
-
- /**
* PayPal customer.
*
* @var PaypalCustomer
@@ -77,17 +69,14 @@
* @constructor
* @param Paypal $paypalPage
* @param CheckoutOnepageSuccess $checkoutOnepageSuccess
- * @param PaypalExpressReview $paypalExpressReview
* @param PaypalCustomer $paypalCustomer
*/
public function __construct(
Paypal $paypalPage,
CheckoutOnepageSuccess $checkoutOnepageSuccess,
- PaypalExpressReview $paypalExpressReview,
PaypalCustomer $paypalCustomer
) {
$this->paypalPage = $paypalPage;
- $this->paypalExpressReview = $paypalExpressReview;
$this->checkoutOnepageSuccess = $checkoutOnepageSuccess;
$this->customer = $paypalCustomer;
}
@@ -104,12 +93,9 @@
: $this->paypalPage->getOldReviewBlock();
$this->selectCustomerAddress($this->customer);
$this->reviewBlock->continueCheckout();
- $this->paypalExpressReview->getReviewBlock()->isPlaceOrderVisible();
- $orderId = $this->paypalExpressReview->getReviewBlock()->isPlaceOrderVisible()
- ? null
- : $this->checkoutOnepageSuccess->getSuccessBlock()->getGuestOrderId();
+ $successBlock = $this->checkoutOnepageSuccess->getSuccessBlock();
- return ['orderId' => $orderId];
+ return ['orderId' => $successBlock->isVisible() ? $successBlock->getGuestOrderId() : null];
}
/**
diff -ruN dev/tests/functional/tests/app/Mage/SalesRule/Test/Handler/SalesRule/Curl.php dev/tests/functional/tests/app/Mage/SalesRule/Test/Handler/SalesRule/Curl.php
--- dev/tests/functional/tests/app/Mage/SalesRule/Test/Handler/SalesRule/Curl.php 2015-06-26 10:53:36.000000000 +0200
+++ dev/tests/functional/tests/app/Mage/SalesRule/Test/Handler/SalesRule/Curl.php 2015-08-03 12:35:00.000000000 +0200
@@ -93,6 +93,9 @@
'aggregator' => 'all',
'value' => '1',
],
+ 'Customer Segment' => [
+ 'type' => 'enterprise_customersegment/segment_condition_segment',
+ ],
'Category' => [
'type' => 'salesrule/rule_condition_product',
'attribute' => 'category_ids',
diff -ruN dev/tests/functional/tests/app/Mage/Widget/Test/Fixture/Widget.xml dev/tests/functional/tests/app/Mage/Widget/Test/Fixture/Widget.xml
--- dev/tests/functional/tests/app/Mage/Widget/Test/Fixture/Widget.xml 1970-01-01 01:00:00.000000000 +0100
+++ dev/tests/functional/tests/app/Mage/Widget/Test/Fixture/Widget.xml 2015-08-03 12:35:00.000000000 +0200
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category Tests
+ * @package Tests_Functional
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
+ <fixture name="widget" module="Mage_Widget" type="flat" entity_type="widget_instance" collection="Mage\Widget\Model\Resource\Widget\Instance\Collection" identifier="parameters" repository_class="Mage\Widget\Test\Repository\Widget" handler_interface="Mage\Widget\Test\Handler\Widget\WidgetInterface" class="Mage\Widget\Test\Fixture\Widget">
+ <dataset name="default">
+ <field name="type" xsi:type="string">Banner Rotator</field>
+ <field name="package_theme" xsi:type="string">rwd / enterprise</field>
+ <field name="title" xsi:type="string">Test Frontend App</field>
+ <field name="widget_instance" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="page_group" xsi:type="string">all_pages</item>
+ <item name="all_pages" xsi:type="array">
+ <item name="layout_handle" xsi:type="string">default</item>
+ <item name="for" xsi:type="string">all</item>
+ <item name="block" xsi:type="string">content</item>
+ <item name="template" xsi:type="string">widget/block.phtml</item>
+ </item>
+ </item>
+ </field>
+ <field name="widgetOptions" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="type_id" xsi:type="string">bannerRotator</item>
+ </item>
+ </field>
+ </dataset>
+ <field name="instance_id" is_required="1">
+ <default_value xsi:type="null" />
+ </field>
+ <field name="instance_type" is_required="0">
+ <default_value xsi:type="null" />
+ </field>
+ <field name="package_theme" is_required="0" group="settings">
+ <default_value xsi:type="null" />
+ </field>
+ <field name="title" is_required="0" group="frontend_properties">
+ <default_value xsi:type="null" />
+ </field>
+ <field name="store_ids" source="Mage\Widget\Test\Fixture\Widget\StoreIds"/>
+ <field name="parameters" is_required="0">
+ <default_value xsi:type="null" />
+ </field>
+ <field name="sort_order" is_required="0">
+ <default_value xsi:type="string">0</default_value>
+ </field>
+ <field name="type" group="settings"/>
+ <field name="widget_instance"/>
+ <field name="id"/>
+ <field name="page_id"/>
+ <field name="layout" group="layout_updates" source="Mage\Widget\Test\Fixture\Widget\LayoutUpdates"/>
+ <field name="widgetOptions" group="widget_options" source="Mage\Widget\Test\Fixture\Widget\WidgetOptions"/>
+ </fixture>
+</config>
diff -ruN dev/tests/functional/tests/app/Mage/Widget/Test/Page/Adminhtml/WidgetInstanceEdit.xml dev/tests/functional/tests/app/Mage/Widget/Test/Page/Adminhtml/WidgetInstanceEdit.xml
--- dev/tests/functional/tests/app/Mage/Widget/Test/Page/Adminhtml/WidgetInstanceEdit.xml 2015-06-26 10:53:36.000000000 +0200
+++ dev/tests/functional/tests/app/Mage/Widget/Test/Page/Adminhtml/WidgetInstanceEdit.xml 2015-08-03 12:35:00.000000000 +0200
@@ -28,6 +28,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
<page name="WidgetInstanceEdit" area="Adminhtml" mca="widget_instance/edit" module="Mage_Widget">
<block name="widgetForm" class="Mage\Widget\Test\Block\Adminhtml\Widget\Instance\Edit\WidgetForm" locator="[id='page:main-container']" strategy="css selector"/>
+ <block name="bannerGrid" class="Enterprise\Banner\Test\Block\Adminhtml\Banner\Grid" locator="#bannerGrid" strategy="css selector"/>
<block name="pageActionsBlock" class="Mage\Widget\Test\Block\Adminhtml\FormPageActions" locator=".form-buttons" strategy="css selector"/>
<block name="templateBlock" class="Mage\Adminhtml\Test\Block\Template" locator="body" strategy="css selector"/>
</page>
diff -ruN downloader/Maged/Controller.php downloader/Maged/Controller.php
--- downloader/Maged/Controller.php 2015-06-26 10:53:38.000000000 +0200
+++ downloader/Maged/Controller.php 2015-08-03 12:35:14.000000000 +0200
@@ -1034,7 +1034,7 @@
'major' => '1',
'minor' => '9',
'revision' => '2',
- 'patch' => '0',
+ 'patch' => '1',
'stability' => '',
'number' => '',
);
diff -ruN downloader/template/connect/packages_prepare.phtml downloader/template/connect/packages_prepare.phtml
--- downloader/template/connect/packages_prepare.phtml 2015-06-26 10:53:38.000000000 +0200
+++ downloader/template/connect/packages_prepare.phtml 2015-08-03 12:35:14.000000000 +0200
@@ -33,7 +33,6 @@
Extension dependencies
<form action="<?php
echo $this->url('connectInstallPackagePost')?>" method="post" target="connect_iframe" onsubmit="onSubmit(this)">
- <input type="hidden" name="install_package_id" value="<?php echo $this->get('package_id'); ?>">
<input name="form_key" type="hidden" value="<?php echo $this->getFormKey() ?>" />
<input type="hidden" name="install_package_id" value="<?php echo $this->escapeHtml($this->get('package_id')); ?>">
<table cellspacing="0" cellpadding="0" width="100%">
diff -ruN errors/design.xml errors/design.xml
--- errors/design.xml 2015-06-26 10:53:36.000000000 +0200
+++ errors/design.xml 2015-08-03 12:35:00.000000000 +0200
@@ -1,28 +1,10 @@
<?xml version="1.0"?>
<!--
/**
- * Magento Enterprise Edition
+ * {license_notice}
*
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Magento Enterprise Edition License
- * that is bundled with this package in the file LICENSE_EE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://www.magentocommerce.com/license/enterprise-edition
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Mage
- * @package Errors
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
- * @license http://www.magentocommerce.com/license/enterprise-edition
+ * @copyright {copyright}
+ * @license {license_link}
*/
-->
<config>
diff -ruN js/extjs/fix-defer-before.js js/extjs/fix-defer-before.js
--- js/extjs/fix-defer-before.js 2015-06-26 10:53:38.000000000 +0200
+++ js/extjs/fix-defer-before.js 2015-08-03 12:35:14.000000000 +0200
@@ -9,17 +9,17 @@
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
+ * to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
+ * needs please refer to http://www.magento.com for more information.
*
* @category Mage
* @package js
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
/*@cc_on
diff -ruN js/extjs/fix-defer.js js/extjs/fix-defer.js
--- js/extjs/fix-defer.js 2015-06-26 10:53:38.000000000 +0200
+++ js/extjs/fix-defer.js 2015-08-03 12:35:14.000000000 +0200
@@ -1,37 +1,37 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Mage
- * @package js
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-
-(function(){
- var eDefer = Function.prototype.defer;
- Function.prototype.defer = function() {
- var argLen = arguments.length;
- if (argLen==0 || (argLen==1 && arguments[0]==1)) {
- //common for Prototype Ajax requests
- return this.delay.curry(0.01).apply(this, arguments);
- }
-
- return eDefer.apply(this, arguments);
- }
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category Mage
+ * @package js
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+(function(){
+ var eDefer = Function.prototype.defer;
+ Function.prototype.defer = function() {
+ var argLen = arguments.length;
+ if (argLen==0 || (argLen==1 && arguments[0]==1)) {
+ //common for Prototype Ajax requests
+ return this.delay.curry(0.01).apply(this, arguments);
+ }
+
+ return eDefer.apply(this, arguments);
+ }
})();
\ No newline at end of file
diff -ruN js/lib/jquery/noconflict.js js/lib/jquery/noconflict.js
--- js/lib/jquery/noconflict.js 2015-06-26 10:53:36.000000000 +0200
+++ js/lib/jquery/noconflict.js 2015-08-03 12:35:16.000000000 +0200
@@ -9,17 +9,17 @@
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
+ * to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
+ * needs please refer to http://www.magento.com for more information.
*
- * @category design
- * @package rwd_default
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
+ * @category Mage
+ * @package js
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff -ruN lib/flex/varien/varien/upload/Uploader.as lib/flex/varien/varien/upload/Uploader.as
--- lib/flex/varien/varien/upload/Uploader.as 2015-06-26 10:53:36.000000000 +0200
+++ lib/flex/varien/varien/upload/Uploader.as 2015-08-03 12:35:02.000000000 +0200
@@ -9,15 +9,17 @@
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
+ * to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
+ * needs please refer to http://www.magento.com for more information.
*
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @category Mage
+ * @package Mage_Uploader
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
package varien.upload
diff -ruN lib/flex/varien/varien/upload/UploaderEvent.as lib/flex/varien/varien/upload/UploaderEvent.as
--- lib/flex/varien/varien/upload/UploaderEvent.as 2015-06-26 10:53:36.000000000 +0200
+++ lib/flex/varien/varien/upload/UploaderEvent.as 2015-08-03 12:35:02.000000000 +0200
@@ -9,15 +9,17 @@
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
+ * to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
+ * needs please refer to http://www.magento.com for more information.
*
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @category Mage
+ * @package Mage_Uploader
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
package varien.upload
diff -ruN lib/flex/varien/varien/upload/UploaderSingle.as lib/flex/varien/varien/upload/UploaderSingle.as
--- lib/flex/varien/varien/upload/UploaderSingle.as 2015-06-26 10:53:36.000000000 +0200
+++ lib/flex/varien/varien/upload/UploaderSingle.as 2015-08-03 12:35:02.000000000 +0200
@@ -9,15 +9,17 @@
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
+ * to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
+ * needs please refer to http://www.magento.com for more information.
*
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @category Mage
+ * @package Mage_Uploader
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
package varien.upload
diff -ruN pkginfo/.htaccess pkginfo/.htaccess
--- pkginfo/.htaccess 2015-06-26 10:53:38.000000000 +0200
+++ pkginfo/.htaccess 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-Order deny,allow
-Deny from all
diff -ruN pkginfo/Mage_All_Latest.txt pkginfo/Mage_All_Latest.txt
--- pkginfo/Mage_All_Latest.txt 2015-06-26 10:53:38.000000000 +0200
+++ pkginfo/Mage_All_Latest.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-THIS IS A METAPACKAGE FOR CORE MAGENTO INSTALLATION
-
-IT DEPENDS ON FOLLOWING PACKAGES:
-
-* Mage_Core_Modules
-* Mage_Core_Adminhtml
-* Interface_Adminhtml_Default
-* Interface_Frontend_Default
-* Interface_Install_Default
\ No newline at end of file
diff -ruN pkginfo/Mage_All.txt pkginfo/Mage_All.txt
--- pkginfo/Mage_All.txt 2015-06-26 10:53:38.000000000 +0200
+++ pkginfo/Mage_All.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-THIS IS A METAPACKAGE FOR UPGRADE FROM 0.9 TO 1.0
-
-IT PREVIOUSLY CONTAINED AND NOW DEPENDS ON FOLLOWING SUBPACKAGES:
-
-* Mage_Core_Modules
-* Mage_Core_Adminhtml
-* Lib_Google_Checkout
-* Lib_Js_Calendar
-* Lib_Js_Ext
-* Lib_Js_Mage
-* Lib_Js_Prototype
-* Lib_Js_Tinymce
\ No newline at end of file
diff -ruN RELEASE_NOTES.txt RELEASE_NOTES.txt
--- RELEASE_NOTES.txt 2015-06-26 10:53:38.000000000 +0200
+++ RELEASE_NOTES.txt 2015-08-03 12:35:00.000000000 +0200
@@ -1,3 +1,13 @@
+==== 1.9.2.1 ====
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+] NOTE: Current Release Notes are maintained at: [
+] [
+] http://merch.docs.magento.com/ce/user_guide/Magento_Community_Edition_User_Guide.html#magento/release-notes-ce-1.9.2.html [
+] [
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
==== 1.9.2.0 ====
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff -ruN shell/abstract.php shell/abstract.php
--- shell/abstract.php 2015-06-26 10:53:38.000000000 +0200
+++ shell/abstract.php 2015-08-03 12:35:00.000000000 +0200
@@ -10,18 +10,18 @@
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
+ * to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
+ * needs please refer to http://www.magento.com for more information.
*
* @category Mage
* @package Mage_Shell
- * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
diff -ruN shell/compiler.php shell/compiler.php
--- shell/compiler.php 2015-06-26 10:53:38.000000000 +0200
+++ shell/compiler.php 2015-08-03 12:35:00.000000000 +0200
@@ -10,18 +10,18 @@
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
+ * to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
+ * needs please refer to http://www.magento.com for more information.
*
* @category Mage
* @package Mage_Shell
- * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
require_once 'abstract.php';
diff -ruN shell/indexer.php shell/indexer.php
--- shell/indexer.php 2015-06-26 10:53:38.000000000 +0200
+++ shell/indexer.php 2015-08-03 12:35:00.000000000 +0200
@@ -10,18 +10,18 @@
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
+ * to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
+ * needs please refer to http://www.magento.com for more information.
*
* @category Mage
* @package Mage_Shell
- * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
require_once 'abstract.php';
diff -ruN shell/log.php shell/log.php
--- shell/log.php 2015-06-26 10:53:38.000000000 +0200
+++ shell/log.php 2015-08-03 12:35:00.000000000 +0200
@@ -10,18 +10,18 @@
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
+ * to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
+ * needs please refer to http://www.magento.com for more information.
*
* @category Mage
* @package Mage_Shell
- * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
require_once 'abstract.php';
diff -ruN skin/adminhtml/default/default/below_ie7.css skin/adminhtml/default/default/below_ie7.css
--- skin/adminhtml/default/default/below_ie7.css 2015-06-26 10:53:36.000000000 +0200
+++ skin/adminhtml/default/default/below_ie7.css 2015-08-03 12:35:06.000000000 +0200
@@ -9,16 +9,18 @@
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
+ * to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
+ * needs please refer to http://www.magento.com for more information.
*
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category design
+ * @package default_default
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
/* Set min-width */
.wrapper { width:expression(document.body.clientWidth<1004?'1003px':'auto'); zoom:1; }
@@ -54,4 +56,4 @@
.product-options .options-list li { zoom:1; }
/* Hover Fix */
-iframe.hover-fix { position:absolute; left:-1px; top:-1px; z-index:-1; background:transparent; filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0); }
\ No newline at end of file
+iframe.hover-fix { position:absolute; left:-1px; top:-1px; z-index:-1; background:transparent; filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0); }
diff -ruN skin/adminhtml/default/default/boxes.css skin/adminhtml/default/default/boxes.css
--- skin/adminhtml/default/default/boxes.css 2015-06-26 10:53:36.000000000 +0200
+++ skin/adminhtml/default/default/boxes.css 2015-08-03 12:35:06.000000000 +0200
@@ -9,16 +9,18 @@
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
+ * to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
+ * needs please refer to http://www.magento.com for more information.
*
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category design
+ * @package default_default
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
/***************** WIDGETS ******************
diff -ruN skin/adminhtml/default/default/custom.css skin/adminhtml/default/default/custom.css
--- skin/adminhtml/default/default/custom.css 2015-06-26 10:53:36.000000000 +0200
+++ skin/adminhtml/default/default/custom.css 2015-08-03 12:35:06.000000000 +0200
@@ -9,14 +9,17 @@
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
+ * to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
+ * needs please refer to http://www.magento.com for more information.
*
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category design
+ * @package default_default
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
+
diff -ruN skin/adminhtml/default/default/ie7.css skin/adminhtml/default/default/ie7.css
--- skin/adminhtml/default/default/ie7.css 2015-06-26 10:53:36.000000000 +0200
+++ skin/adminhtml/default/default/ie7.css 2015-08-03 12:35:06.000000000 +0200
@@ -9,19 +9,21 @@
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
+ * to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
+ * needs please refer to http://www.magento.com for more information.
*
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category design
+ * @package default_default
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
.db-menu ul li a { background:transparent url(images/db-menu-bg-up.gif) repeat-x 0px 3px; height:26px; }
.db-menu ul li a:hover, .db-menu ul li a.hover { background:transparent url(images/db-menu-bg-hov.gif) repeat-x 0px 3px; }
.graph-block { height:auto; }
-.db-menu { width:947px; }
\ No newline at end of file
+.db-menu { width:947px; }
diff -ruN skin/adminhtml/default/default/iestyles.css skin/adminhtml/default/default/iestyles.css
--- skin/adminhtml/default/default/iestyles.css 2015-06-26 10:53:36.000000000 +0200
+++ skin/adminhtml/default/default/iestyles.css 2015-08-03 12:35:06.000000000 +0200
@@ -9,16 +9,18 @@
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
+ * to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
+ * needs please refer to http://www.magento.com for more information.
*
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category design
+ * @package default_default
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
/* Clearing */
.message-popup .message-popup-head,
diff -ruN skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-catalog.css skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-catalog.css
--- skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-catalog.css 2015-06-26 10:53:36.000000000 +0200
+++ skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-catalog.css 2015-08-03 12:35:06.000000000 +0200
@@ -1,280 +1,304 @@
-body { margin: 0; padding: 0 }
-
-.main-block
-{
- width: 320px;
- height: 450px;
-}
-.header-sign-1
-{
- font: bold 12px arial;
- color: #e9e9e9;
- float: left;
- padding: 5px 0 3px 3px;
- height: 10px;
-}
-.top-header
-{
- height: 20px
-}
-
-.battery
-{
- height: 16px;
- width: 25px;
- float: right;
- margin: 0px 5px 5px 13px;
-}
-
-.volume
-{
- height: 16px;
- width: 25px;
- float: left;
-}
-
-.antenna
-{
- height: 16px;
- width: 18px;
- float: left;
- padding-left: 20px;
-}
-.time
-{
- width: 50%;
- position:relative;
- top:3px;
- text-align: center;
- font: bold 12px arial;
- color: #e9e9e9;
- float: left;
-}
-
-.main-header
-{
- width: 100%;
- height: 50px;
- color: #f3f3f3;
- text-align: center;
-}
-.main-header-text
-{
-
-}
-
-.clearB
-{
- clear: both;
- height: 1px;
-}
-.btn-l
-{
- position:relative;
- left: 0px;
- top:7px;
- width: 70px;
- height: 32px;
- text-align: center;
- float: left;
- margin: 0 0 0 15px;
- background:url('btn-l.png') center center no-repeat;
-}
-
-.btn-r
-{
- position:relative;
- right: 0px;
- top:7px;
- width: 72px;
- height: 32px;
- text-align: center;
- float: right;
- margin: 0 20px 0 0;
- background:url('btn-r.png') center center no-repeat;
-}
-.main-header-text
-{
- width: 110px;
- height: 32px;
- text-align: center;
- float: left;
-}
-