From 62575cafccb059bbc8921efc0d7f524a3de90e74 Mon Sep 17 00:00:00 2001 From: Toon Spin Date: Tue, 4 Aug 2015 22:15:54 +0200 Subject: [PATCH] Import Magento Release 1.9.2.1 --- RELEASE_NOTES.txt | 10 + app/Mage.php | 2 +- .../Mage/Api/Model/Server/Adapter/Soap.php | 6 +- .../Mage/Catalog/Helper/Product/Compare.php | 2 +- .../Mage/Catalog/Model/Product/Api/V2.php | 5 +- app/code/core/Mage/Catalog/etc/api.xml | 2 +- app/code/core/Mage/Cms/Block/Block.php | 20 + app/code/core/Mage/Cms/Block/Widget/Block.php | 16 + .../Mage/Core/Controller/Request/Http.php | 14 +- app/code/core/Mage/Core/Model/Email/Queue.php | 3 - .../core/Mage/Log/Model/Resource/Visitor.php | 2 +- .../core/Mage/PageCache/etc/adminhtml.xml | 2 +- .../Mage/Paypal/Model/Express/Checkout.php | 18 +- .../default/template/page/js/calendar.phtml | 1 - .../default/template/moneybookers/blank.phtml | 2 +- .../default/template/moneybookers/form.phtml | 2 +- .../default/template/moneybookers/info.phtml | 2 +- .../template/moneybookers/payment.phtml | 2 +- .../template/moneybookers/placeform.phtml | 2 +- .../template/moneybookers/redirect.phtml | 2 +- .../default/template/page/js/cookie.phtml | 4 +- app/locale/en_US/Mage_Adminhtml.csv | 47 ++ app/locale/en_US/Mage_Catalog.csv | 10 + app/locale/en_US/Mage_CatalogRule.csv | 4 + app/locale/en_US/Mage_Checkout.csv | 1 + app/locale/en_US/Mage_Cron.csv | 8 + app/locale/en_US/Mage_Customer.csv | 3 + app/locale/en_US/Mage_Dataflow.csv | 2 + app/locale/en_US/Mage_Directory.csv | 1 + app/locale/en_US/Mage_Log.csv | 1 + app/locale/en_US/Mage_Page.csv | 1 + app/locale/en_US/Mage_PageCache.csv | 1 + app/locale/en_US/Mage_Payment.csv | 5 + app/locale/en_US/Mage_Paypal.csv | 27 + app/locale/en_US/Mage_Review.csv | 1 + app/locale/en_US/Mage_Rule.csv | 10 + app/locale/en_US/Mage_Sales.csv | 3 + app/locale/en_US/Mage_Shipping.csv | 1 + app/locale/en_US/Mage_Weee.csv | 1 + app/locale/en_US/Mage_Wishlist.csv | 3 + dev/tests/functional/composer.json | 1 + .../Test/Fixture/Role/RolesResources.php | 7 + .../Test/TestCase/CreateStoreEntityTest.php | 184 ++++++ .../AddProductsToMultipleWishListTest.xml | 40 ++ .../TestCase/CreateRmaEntityOnBackendTest.xml | 44 ++ .../Mage/Checkout/Test/Fixture/Cart/Items.php | 1 + .../AddProductsToMultipleWishListTest.xml | 40 ++ .../Mage/Paypal/Test/Block/AbstractReview.php | 1 - .../Mage/Paypal/Test/Block/Express/Review.php | 10 - ...rExpressCheckoutWithinPayPalButtonTest.xml | 10 +- .../TestStep/ContinuePayPalCheckoutStep.php | 18 +- .../SalesRule/Test/Handler/SalesRule/Curl.php | 3 + .../app/Mage/Widget/Test/Fixture/Widget.xml | 77 +++ .../Page/Adminhtml/WidgetInstanceEdit.xml | 1 + downloader/Maged/Controller.php | 2 +- .../template/connect/packages_prepare.phtml | 1 - errors/design.xml | 24 +- js/extjs/fix-defer-before.js | 6 +- js/extjs/fix-defer.js | 72 +-- js/lib/jquery/noconflict.js | 10 +- lib/flex/varien/varien/upload/Uploader.as | 8 +- .../varien/varien/upload/UploaderEvent.as | 8 +- .../varien/varien/upload/UploaderSingle.as | 8 +- pkginfo/.htaccess | 2 - pkginfo/Mage_All.txt | 12 - pkginfo/Mage_All_Latest.txt | 9 - shell/abstract.php | 8 +- shell/compiler.php | 8 +- shell/indexer.php | 8 +- shell/log.php | 8 +- skin/adminhtml/default/default/below_ie7.css | 12 +- skin/adminhtml/default/default/boxes.css | 10 +- skin/adminhtml/default/default/custom.css | 11 +- skin/adminhtml/default/default/ie7.css | 12 +- skin/adminhtml/default/default/iestyles.css | 10 +- .../mobile_preview/mobile-catalog.css | 584 +++++++++--------- .../xmlconnect/mobile_preview/mobile-home.css | 386 ++++++------ .../lib/prototype/windows/themes/magento.css | 24 + skin/adminhtml/default/default/menu.css | 12 +- .../default/default/oauth-simple.css | 8 +- skin/adminhtml/default/default/print.css | 12 +- skin/adminhtml/default/default/reset.css | 12 +- .../default/default/xmlconnect/boxes.css | 10 +- .../default/default/xmlconnect/dropdown.css | 26 +- .../default/default/xmlconnect/iestyles.css | 10 +- .../default/xmlconnect/mobile-android.css | 12 +- .../default/xmlconnect/mobile-catalog.css | 16 +- .../default/xmlconnect/mobile-home.css | 14 +- .../xmlconnect/mobile-ipad-catalog.css | 12 +- .../default/xmlconnect/mobile-ipad-home.css | 10 +- .../default/default/xmlconnect/styles.css | 24 + skin/frontend/default/blue/css/styles-ie.css | 2 +- skin/frontend/default/blue/css/styles.css | 2 +- .../jquery.elevateZoom-3.0.8.min.js | 24 - .../js/lib/elevatezoom/jquery.elevatezoom.js | 24 - skin/frontend/rwd/default/js/lib/enquire.js | 24 - skin/frontend/rwd/default/js/lib/fastclick.js | 24 - .../rwd/default/js/lib/imagesloaded.js | 24 - .../rwd/default/js/lib/jquery.cycle2.min.js | 24 - .../default/js/lib/jquery.cycle2.swipe.min.js | 24 - .../default/js/lib/matchMedia.addListener.js | 24 - .../frontend/rwd/default/js/lib/matchMedia.js | 24 - .../default/js/lib/modernizr.custom.min.js | 24 - .../rwd/default/js/lib/selectivizr.js | 24 - .../rwd/default/scss/vendor/_normalize.scss | 25 - skin/install/default/default/css/boxes.css | 10 +- skin/install/default/default/css/clears.css | 10 +- skin/install/default/default/css/ie7minus.css | 10 +- skin/install/default/default/css/iestyles.css | 10 +- skin/install/default/default/css/reset.css | 10 +- ....9.2.0.xml => Cm_RedisSession-1.9.2.1.xml} | 10 +- ...> Interface_Adminhtml_Default-1.9.2.1.xml} | 12 +- ...terface_Frontend_Base_Default-1.9.2.1.xml} | 12 +- ...=> Interface_Frontend_Default-1.9.2.1.xml} | 10 +- ...nterface_Frontend_Rwd_Default-1.9.2.1.xml} | 12 +- ... => Interface_Install_Default-1.9.2.1.xml} | 12 +- ...{Lib_Cm-1.9.2.0.xml => Lib_Cm-1.9.2.1.xml} | 10 +- ...dis-1.9.2.0.xml => Lib_Credis-1.9.2.1.xml} | 8 +- ....0.xml => Lib_Google_Checkout-1.9.2.1.xml} | 8 +- ...DNA2-1.9.2.0.xml => Lib_IDNA2-1.9.2.1.xml} | 8 +- ...1.1.1.xml => Lib_Js_Calendar-1.51.1.2.xml} | 8 +- ...Ext-1.7.0.0.xml => Lib_Js_Ext-1.9.2.1.xml} | 10 +- ...ge-1.9.2.0.xml => Lib_Js_Mage-1.9.2.1.xml} | 12 +- ...7.0.1.xml => Lib_Js_Prototype-1.9.2.1.xml} | 8 +- ...5.11.0.xml => Lib_Js_TinyMCE-3.5.11.1.xml} | 8 +- ....xml => Lib_LinLibertineFont-2.8.14.2.xml} | 8 +- ..._Mage-1.9.2.0.xml => Lib_Mage-1.9.2.1.xml} | 8 +- ...to-1.9.2.0.xml => Lib_Magento-1.9.2.1.xml} | 8 +- ...ago-1.9.1.0.xml => Lib_Pelago-1.9.2.1.xml} | 8 +- ...-1.5.0.0.xml => Lib_Phpseclib-1.9.2.1.xml} | 8 +- ...ien-1.9.2.0.xml => Lib_Varien-1.9.2.1.xml} | 10 +- ..._ZF-1.12.10.0.xml => Lib_ZF-1.12.10.1.xml} | 10 +- ...2.10.0.xml => Lib_ZF_Locale-1.12.10.1.xml} | 8 +- var/package/Mage_All_Latest-1.9.2.0.xml | 18 - var/package/Mage_All_Latest-1.9.2.1.xml | 18 + ...-1.9.2.0.xml => Mage_Centinel-1.9.2.1.xml} | 10 +- ...-1.9.2.0.xml => Mage_Compiler-1.9.2.1.xml} | 10 +- ....0.xml => Mage_Core_Adminhtml-1.9.2.1.xml} | 12 +- ....2.0.xml => Mage_Core_Modules-1.9.2.1.xml} | 12 +- ....9.2.0.xml => Mage_Downloader-1.9.2.1.xml} | 10 +- ....2.0.xml => Mage_Locale_en_US-1.9.2.1.xml} | 10 +- ...1.9.2.0.xml => Magento_Mobile-1.9.2.1.xml} | 12 +- ...0.xml => Phoenix_Moneybookers-1.9.2.1.xml} | 12 +- 143 files changed, 1592 insertions(+), 1198 deletions(-) create mode 100644 dev/tests/functional/tests/app/Mage/Adminhtml/Test/TestCase/CreateStoreEntityTest.php create mode 100644 dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/AddProductsToMultipleWishListTest.xml create mode 100644 dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/CreateRmaEntityOnBackendTest.xml create mode 100644 dev/tests/functional/tests/app/Mage/Downloadable/Test/TestCase/AddProductsToMultipleWishListTest.xml create mode 100644 dev/tests/functional/tests/app/Mage/Widget/Test/Fixture/Widget.xml delete mode 100644 pkginfo/.htaccess delete mode 100644 pkginfo/Mage_All.txt delete mode 100644 pkginfo/Mage_All_Latest.txt rename var/package/{Cm_RedisSession-1.9.2.0.xml => Cm_RedisSession-1.9.2.1.xml} (85%) rename var/package/{Interface_Adminhtml_Default-1.9.2.0.xml => Interface_Adminhtml_Default-1.9.2.1.xml} (98%) rename var/package/{Interface_Frontend_Base_Default-1.9.2.0.xml => Interface_Frontend_Base_Default-1.9.2.1.xml} (99%) rename var/package/{Interface_Frontend_Default-1.9.2.0.xml => Interface_Frontend_Default-1.9.2.1.xml} (98%) rename var/package/{Interface_Frontend_Rwd_Default-1.9.2.0.xml => Interface_Frontend_Rwd_Default-1.9.2.1.xml} (96%) rename var/package/{Interface_Install_Default-1.9.2.0.xml => Interface_Install_Default-1.9.2.1.xml} (87%) rename var/package/{Lib_Cm-1.9.2.0.xml => Lib_Cm-1.9.2.1.xml} (82%) rename var/package/{Lib_Credis-1.9.2.0.xml => Lib_Credis-1.9.2.1.xml} (86%) rename var/package/{Lib_Google_Checkout-1.9.2.0.xml => Lib_Google_Checkout-1.9.2.1.xml} (83%) rename var/package/{Lib_IDNA2-1.9.2.0.xml => Lib_IDNA2-1.9.2.1.xml} (89%) rename var/package/{Lib_Js_Calendar-1.51.1.1.xml => Lib_Js_Calendar-1.51.1.2.xml} (95%) rename var/package/{Lib_Js_Ext-1.7.0.0.xml => Lib_Js_Ext-1.9.2.1.xml} (98%) rename var/package/{Lib_Js_Mage-1.9.2.0.xml => Lib_Js_Mage-1.9.2.1.xml} (95%) rename var/package/{Lib_Js_Prototype-1.7.0.1.xml => Lib_Js_Prototype-1.9.2.1.xml} (99%) rename var/package/{Lib_Js_TinyMCE-3.5.11.0.xml => Lib_Js_TinyMCE-3.5.11.1.xml} (99%) rename var/package/{Lib_LinLibertineFont-2.8.14.1.xml => Lib_LinLibertineFont-2.8.14.2.xml} (92%) rename var/package/{Lib_Mage-1.9.2.0.xml => Lib_Mage-1.9.2.1.xml} (98%) rename var/package/{Lib_Magento-1.9.2.0.xml => Lib_Magento-1.9.2.1.xml} (94%) rename var/package/{Lib_Pelago-1.9.1.0.xml => Lib_Pelago-1.9.2.1.xml} (86%) rename var/package/{Lib_Phpseclib-1.5.0.0.xml => Lib_Phpseclib-1.9.2.1.xml} (94%) rename var/package/{Lib_Varien-1.9.2.0.xml => Lib_Varien-1.9.2.1.xml} (92%) rename var/package/{Lib_ZF-1.12.10.0.xml => Lib_ZF-1.12.10.1.xml} (99%) rename var/package/{Lib_ZF_Locale-1.12.10.0.xml => Lib_ZF_Locale-1.12.10.1.xml} (99%) delete mode 100644 var/package/Mage_All_Latest-1.9.2.0.xml create mode 100644 var/package/Mage_All_Latest-1.9.2.1.xml rename var/package/{Mage_Centinel-1.9.2.0.xml => Mage_Centinel-1.9.2.1.xml} (96%) rename var/package/{Mage_Compiler-1.9.2.0.xml => Mage_Compiler-1.9.2.1.xml} (91%) rename var/package/{Mage_Core_Adminhtml-1.9.2.0.xml => Mage_Core_Adminhtml-1.9.2.1.xml} (99%) rename var/package/{Mage_Core_Modules-1.9.2.0.xml => Mage_Core_Modules-1.9.2.1.xml} (99%) rename var/package/{Mage_Downloader-1.9.2.0.xml => Mage_Downloader-1.9.2.1.xml} (97%) rename var/package/{Mage_Locale_en_US-1.9.2.0.xml => Mage_Locale_en_US-1.9.2.1.xml} (77%) rename var/package/{Magento_Mobile-1.9.2.0.xml => Magento_Mobile-1.9.2.1.xml} (98%) rename var/package/{Phoenix_Moneybookers-1.9.2.0.xml => Phoenix_Moneybookers-1.9.2.1.xml} (92%) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 8ab62e43b2f..54cedb9139a 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -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 --git a/app/Mage.php b/app/Mage.php index 6b07350493a..4170479dc97 100644 --- a/app/Mage.php +++ b/app/Mage.php @@ -171,7 +171,7 @@ public static function getVersionInfo() 'major' => '1', 'minor' => '9', 'revision' => '2', - 'patch' => '0', + 'patch' => '1', 'stability' => '', 'number' => '', ); diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php index 0f9a3fae819..1ac0d57f363 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php @@ -233,9 +233,9 @@ protected function getWsdlUrl($params = null, $withAuth = true) : $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 --git a/app/code/core/Mage/Catalog/Helper/Product/Compare.php b/app/code/core/Mage/Catalog/Helper/Product/Compare.php index fe350340ee0..a09b49644f4 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Compare.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Compare.php @@ -161,7 +161,7 @@ protected function _getUrlParams($product) */ 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 --git a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php index ff71ec5fe11..46fc492b071 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php @@ -108,7 +108,7 @@ public function info($productId, $store = null, $attributes = null, $identifierT */ 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 @@ public function multiUpdate($productIds, $productData, $store = null, $identifie */ 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 --git a/app/code/core/Mage/Catalog/etc/api.xml b/app/code/core/Mage/Catalog/etc/api.xml index cc0ebdff50c..d546c0d9698 100644 --- a/app/code/core/Mage/Catalog/etc/api.xml +++ b/app/code/core/Mage/Catalog/etc/api.xml @@ -163,7 +163,7 @@ Update product catalog/product/update - + Multi update product catalog/product/update diff --git a/app/code/core/Mage/Cms/Block/Block.php b/app/code/core/Mage/Cms/Block/Block.php index 75aab469244..f5b5223875c 100644 --- a/app/code/core/Mage/Cms/Block/Block.php +++ b/app/code/core/Mage/Cms/Block/Block.php @@ -72,4 +72,24 @@ protected function _toHtml() } 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 --git a/app/code/core/Mage/Cms/Block/Widget/Block.php b/app/code/core/Mage/Cms/Block/Widget/Block.php index eaa392145ec..ecb60284bef 100644 --- a/app/code/core/Mage/Cms/Block/Widget/Block.php +++ b/app/code/core/Mage/Cms/Block/Widget/Block.php @@ -82,10 +82,26 @@ protected function _beforeToHtml() $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 --git a/app/code/core/Mage/Core/Controller/Request/Http.php b/app/code/core/Mage/Core/Controller/Request/Http.php index 770c110b16b..b9098d9940c 100644 --- a/app/code/core/Mage/Core/Controller/Request/Http.php +++ b/app/code/core/Mage/Core/Controller/Request/Http.php @@ -298,11 +298,19 @@ public function getHttpHost($trimPort = true) 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 --git a/app/code/core/Mage/Core/Model/Email/Queue.php b/app/code/core/Mage/Core/Model/Email/Queue.php index 5958c244c06..69f325123d6 100644 --- a/app/code/core/Mage/Core/Model/Email/Queue.php +++ b/app/code/core/Mage/Core/Model/Email/Queue.php @@ -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 --git a/app/code/core/Mage/Log/Model/Resource/Visitor.php b/app/code/core/Mage/Log/Model/Resource/Visitor.php index 3bebd8e6946..ce8c41912b4 100755 --- a/app/code/core/Mage/Log/Model/Resource/Visitor.php +++ b/app/code/core/Mage/Log/Model/Resource/Visitor.php @@ -125,7 +125,7 @@ protected function _afterSave(Mage_Core_Model_Abstract $visitor) return $this; } if ($visitor->getIsNewVisitor()) { - if ($this->_urlLoggingCondition->isLogEnabled()) { + if ($this->_urlLoggingCondition->isVisitorLogEnabled()) { $this->_saveVisitorInfo($visitor); $visitor->setIsNewVisitor(false); } diff --git a/app/code/core/Mage/PageCache/etc/adminhtml.xml b/app/code/core/Mage/PageCache/etc/adminhtml.xml index 94f2c5ed3f6..14f0c7bed92 100644 --- a/app/code/core/Mage/PageCache/etc/adminhtml.xml +++ b/app/code/core/Mage/PageCache/etc/adminhtml.xml @@ -30,7 +30,7 @@ - + External Page Cache 0 diff --git a/app/code/core/Mage/Paypal/Model/Express/Checkout.php b/app/code/core/Mage/Paypal/Model/Express/Checkout.php index 7855dc49738..78e67e5e42f 100644 --- a/app/code/core/Mage/Paypal/Model/Express/Checkout.php +++ b/app/code/core/Mage/Paypal/Model/Express/Checkout.php @@ -430,15 +430,17 @@ public function returnFromPaypal($token) 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 --git a/app/design/adminhtml/default/default/template/page/js/calendar.phtml b/app/design/adminhtml/default/default/template/page/js/calendar.phtml index 648632fc480..d74cbfec7fb 100644 --- a/app/design/adminhtml/default/default/template/page/js/calendar.phtml +++ b/app/design/adminhtml/default/default/template/page/js/calendar.phtml @@ -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 ?> diff --git a/app/design/frontend/base/default/template/moneybookers/form.phtml b/app/design/frontend/base/default/template/moneybookers/form.phtml index b1c3ad5f60c..f48b2c0c085 100644 --- a/app/design/frontend/base/default/template/moneybookers/form.phtml +++ b/app/design/frontend/base/default/template/moneybookers/form.phtml @@ -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 --git a/app/design/frontend/base/default/template/moneybookers/info.phtml b/app/design/frontend/base/default/template/moneybookers/info.phtml index ab5b2b86f20..c95a91be30b 100644 --- a/app/design/frontend/base/default/template/moneybookers/info.phtml +++ b/app/design/frontend/base/default/template/moneybookers/info.phtml @@ -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 --git a/app/design/frontend/base/default/template/moneybookers/payment.phtml b/app/design/frontend/base/default/template/moneybookers/payment.phtml index 96dcd69046d..53ea5f96638 100644 --- a/app/design/frontend/base/default/template/moneybookers/payment.phtml +++ b/app/design/frontend/base/default/template/moneybookers/payment.phtml @@ -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 --git a/app/design/frontend/base/default/template/moneybookers/placeform.phtml b/app/design/frontend/base/default/template/moneybookers/placeform.phtml index 4e09e231e2f..a9739fa6691 100644 --- a/app/design/frontend/base/default/template/moneybookers/placeform.phtml +++ b/app/design/frontend/base/default/template/moneybookers/placeform.phtml @@ -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 --git a/app/design/frontend/base/default/template/moneybookers/redirect.phtml b/app/design/frontend/base/default/template/moneybookers/redirect.phtml index 05f56dee5d8..01f2b654042 100644 --- a/app/design/frontend/base/default/template/moneybookers/redirect.phtml +++ b/app/design/frontend/base/default/template/moneybookers/redirect.phtml @@ -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 --git a/app/design/frontend/base/default/template/page/js/cookie.phtml b/app/design/frontend/base/default/template/page/js/cookie.phtml index 67ceb5203b3..340f4fa4a0f 100644 --- a/app/design/frontend/base/default/template/page/js/cookie.phtml +++ b/app/design/frontend/base/default/template/page/js/cookie.phtml @@ -34,7 +34,7 @@ diff --git a/app/locale/en_US/Mage_Adminhtml.csv b/app/locale/en_US/Mage_Adminhtml.csv index 586eb3b3aa0..60b4bcf8cb9 100644 --- a/app/locale/en_US/Mage_Adminhtml.csv +++ b/app/locale/en_US/Mage_Adminhtml.csv @@ -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 %s%% %s/%d records","Processed %s%% %s/%d 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 --git a/app/locale/en_US/Mage_Catalog.csv b/app/locale/en_US/Mage_Catalog.csv index 83980994ebc..bbdc4178853 100644 --- a/app/locale/en_US/Mage_Catalog.csv +++ b/app/locale/en_US/Mage_Catalog.csv @@ -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 -> Index Management","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> Index Management" +"Please refresh ""Product Attributes"" in System -> Index Management","Please refresh ""Product Attributes"" in System -> Index Management" "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 --git a/app/locale/en_US/Mage_CatalogRule.csv b/app/locale/en_US/Mage_CatalogRule.csv index b0668fe9412..17124ed1eae 100644 --- a/app/locale/en_US/Mage_CatalogRule.csv +++ b/app/locale/en_US/Mage_CatalogRule.csv @@ -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 --git a/app/locale/en_US/Mage_Checkout.csv b/app/locale/en_US/Mage_Checkout.csv index 17b8f0a1807..da89150a363 100644 --- a/app/locale/en_US/Mage_Checkout.csv +++ b/app/locale/en_US/Mage_Checkout.csv @@ -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 --git a/app/locale/en_US/Mage_Cron.csv b/app/locale/en_US/Mage_Cron.csv index f902cb6f898..ae57874f617 100644 --- a/app/locale/en_US/Mage_Cron.csv +++ b/app/locale/en_US/Mage_Cron.csv @@ -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 --git a/app/locale/en_US/Mage_Customer.csv b/app/locale/en_US/Mage_Customer.csv index e3d603f83cd..3cd48fdb091 100644 --- a/app/locale/en_US/Mage_Customer.csv +++ b/app/locale/en_US/Mage_Customer.csv @@ -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 --git a/app/locale/en_US/Mage_Dataflow.csv b/app/locale/en_US/Mage_Dataflow.csv index 48ccf951173..7169faed858 100644 --- a/app/locale/en_US/Mage_Dataflow.csv +++ b/app/locale/en_US/Mage_Dataflow.csv @@ -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 --git a/app/locale/en_US/Mage_Directory.csv b/app/locale/en_US/Mage_Directory.csv index a3e39db3f0c..3d50b2369a2 100644 --- a/app/locale/en_US/Mage_Directory.csv +++ b/app/locale/en_US/Mage_Directory.csv @@ -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 --git a/app/locale/en_US/Mage_Log.csv b/app/locale/en_US/Mage_Log.csv index b117596196a..59d5a9ed925 100644 --- a/app/locale/en_US/Mage_Log.csv +++ b/app/locale/en_US/Mage_Log.csv @@ -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 --git a/app/locale/en_US/Mage_Page.csv b/app/locale/en_US/Mage_Page.csv index adbbecca69c..a60fc885b61 100644 --- a/app/locale/en_US/Mage_Page.csv +++ b/app/locale/en_US/Mage_Page.csv @@ -1,5 +1,6 @@ "%s Item(s)","%s Item(s)" "%s-%s of %s","%s-%s of %s" +"© 2013 Magento Demo Store. All Rights Reserved.","© 2013 Magento Demo Store. All Rights Reserved." "© 2015 Magento Demo Store. All Rights Reserved.","© 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 --git a/app/locale/en_US/Mage_PageCache.csv b/app/locale/en_US/Mage_PageCache.csv index 79f380c0c6c..8cf0a18b013 100644 --- a/app/locale/en_US/Mage_PageCache.csv +++ b/app/locale/en_US/Mage_PageCache.csv @@ -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 --git a/app/locale/en_US/Mage_Payment.csv b/app/locale/en_US/Mage_Payment.csv index a19f501df14..4dd7f9d3bfc 100644 --- a/app/locale/en_US/Mage_Payment.csv +++ b/app/locale/en_US/Mage_Payment.csv @@ -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 --git a/app/locale/en_US/Mage_Paypal.csv b/app/locale/en_US/Mage_Paypal.csv index b69c3bf97d9..772b76873f9 100644 --- a/app/locale/en_US/Mage_Paypal.csv +++ b/app/locale/en_US/Mage_Paypal.csv @@ -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 --git a/app/locale/en_US/Mage_Review.csv b/app/locale/en_US/Mage_Review.csv index 822fc084e45..c5e9b034691 100644 --- a/app/locale/en_US/Mage_Review.csv +++ b/app/locale/en_US/Mage_Review.csv @@ -10,6 +10,7 @@ "4 stars","4 stars" "5 star","5 star" "5 stars","5 stars" +"%2$s %3$s (%4$s)","%2$s %3$s (%4$s)" "%2$s (%3$s)","%2$s (%3$s)" "Add New Review","Add New Review" "Add Your Review","Add Your Review" diff --git a/app/locale/en_US/Mage_Rule.csv b/app/locale/en_US/Mage_Rule.csv index 06c9ccdd30d..8418c3a23de 100644 --- a/app/locale/en_US/Mage_Rule.csv +++ b/app/locale/en_US/Mage_Rule.csv @@ -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 --git a/app/locale/en_US/Mage_Sales.csv b/app/locale/en_US/Mage_Sales.csv index 00792f81cf1..5f4a7c684c8 100644 --- a/app/locale/en_US/Mage_Sales.csv +++ b/app/locale/en_US/Mage_Sales.csv @@ -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 --git a/app/locale/en_US/Mage_Shipping.csv b/app/locale/en_US/Mage_Shipping.csv index 9c61e0ef0f5..010a93e26de 100644 --- a/app/locale/en_US/Mage_Shipping.csv +++ b/app/locale/en_US/Mage_Shipping.csv @@ -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 --git a/app/locale/en_US/Mage_Weee.csv b/app/locale/en_US/Mage_Weee.csv index 04e7170a14e..c8a35cfb588 100644 --- a/app/locale/en_US/Mage_Weee.csv +++ b/app/locale/en_US/Mage_Weee.csv @@ -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 --git a/app/locale/en_US/Mage_Wishlist.csv b/app/locale/en_US/Mage_Wishlist.csv index 9a697499200..9f987d079ba 100644 --- a/app/locale/en_US/Mage_Wishlist.csv +++ b/app/locale/en_US/Mage_Wishlist.csv @@ -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 --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json index 62d6ab44eec..59753538447 100644 --- a/dev/tests/functional/composer.json +++ b/dev/tests/functional/composer.json @@ -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 --git a/dev/tests/functional/tests/app/Mage/Admin/Test/Fixture/Role/RolesResources.php b/dev/tests/functional/tests/app/Mage/Admin/Test/Fixture/Role/RolesResources.php index 0fdc15139c0..b0e6016ca7b 100644 --- a/dev/tests/functional/tests/app/Mage/Admin/Test/Fixture/Role/RolesResources.php +++ b/dev/tests/functional/tests/app/Mage/Admin/Test/Fixture/Role/RolesResources.php @@ -134,6 +134,9 @@ protected function getPreset($name) '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 @@ protected function getPreset($name) '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 --git a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/TestCase/CreateStoreEntityTest.php b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/TestCase/CreateStoreEntityTest.php new file mode 100644 index 00000000000..6f31116efd7 --- /dev/null +++ b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/TestCase/CreateStoreEntityTest.php @@ -0,0 +1,184 @@ + 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 --git a/dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/AddProductsToMultipleWishListTest.xml b/dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/AddProductsToMultipleWishListTest.xml new file mode 100644 index 00000000000..ec571b0594f --- /dev/null +++ b/dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/AddProductsToMultipleWishListTest.xml @@ -0,0 +1,40 @@ + + + + + + wishlist_public + bundleProduct::bundle_dynamic_product + false + 1 + + + + + + diff --git a/dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/CreateRmaEntityOnBackendTest.xml b/dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/CreateRmaEntityOnBackendTest.xml new file mode 100644 index 00000000000..6e54748c3bc --- /dev/null +++ b/dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase/CreateRmaEntityOnBackendTest.xml @@ -0,0 +1,44 @@ + + + + + + bundle_fixed + 1 + Out of Service + Unopened + Store Credit + test%isolation%@example.com + comments %isolation% + Yes + Pending + + + + + diff --git a/dev/tests/functional/tests/app/Mage/Checkout/Test/Fixture/Cart/Items.php b/dev/tests/functional/tests/app/Mage/Checkout/Test/Fixture/Cart/Items.php index 094e896f8f1..785c626b49a 100644 --- a/dev/tests/functional/tests/app/Mage/Checkout/Test/Fixture/Cart/Items.php +++ b/dev/tests/functional/tests/app/Mage/Checkout/Test/Fixture/Cart/Items.php @@ -46,6 +46,7 @@ class Items implements FixtureInterface '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 --git a/dev/tests/functional/tests/app/Mage/Downloadable/Test/TestCase/AddProductsToMultipleWishListTest.xml b/dev/tests/functional/tests/app/Mage/Downloadable/Test/TestCase/AddProductsToMultipleWishListTest.xml new file mode 100644 index 00000000000..4b71236631f --- /dev/null +++ b/dev/tests/functional/tests/app/Mage/Downloadable/Test/TestCase/AddProductsToMultipleWishListTest.xml @@ -0,0 +1,40 @@ + + + + + + wishlist_public + downloadableProduct::with_two_separately_links + false + 1 + + + + + + diff --git a/dev/tests/functional/tests/app/Mage/Paypal/Test/Block/AbstractReview.php b/dev/tests/functional/tests/app/Mage/Paypal/Test/Block/AbstractReview.php index e8c1e1b6d5d..da40e9c39fc 100644 --- a/dev/tests/functional/tests/app/Mage/Paypal/Test/Block/AbstractReview.php +++ b/dev/tests/functional/tests/app/Mage/Paypal/Test/Block/AbstractReview.php @@ -90,7 +90,6 @@ abstract public function getAddressesBlock(); public function continueCheckout() { $this->_rootElement->find($this->continue)->click(); - $this->waitLoader(); } /** diff --git a/dev/tests/functional/tests/app/Mage/Paypal/Test/Block/Express/Review.php b/dev/tests/functional/tests/app/Mage/Paypal/Test/Block/Express/Review.php index 48b97aa770b..790200018e1 100644 --- a/dev/tests/functional/tests/app/Mage/Paypal/Test/Block/Express/Review.php +++ b/dev/tests/functional/tests/app/Mage/Paypal/Test/Block/Express/Review.php @@ -80,14 +80,4 @@ public function selectShippingMethod($shippingMethod) $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 --git a/dev/tests/functional/tests/app/Mage/Paypal/Test/TestCase/TestCreationForExpressCheckoutWithinPayPalButtonTest.xml b/dev/tests/functional/tests/app/Mage/Paypal/Test/TestCase/TestCreationForExpressCheckoutWithinPayPalButtonTest.xml index dbd301b7be1..c1bc8600de9 100644 --- a/dev/tests/functional/tests/app/Mage/Paypal/Test/TestCase/TestCreationForExpressCheckoutWithinPayPalButtonTest.xml +++ b/dev/tests/functional/tests/app/Mage/Paypal/Test/TestCase/TestCreationForExpressCheckoutWithinPayPalButtonTest.xml @@ -32,7 +32,7 @@ active_sales_rule_for_all_groups paypal_express_order_line_items_mark_require_billing_address Flat Rate/Fixed - 215 + 115 Processing Authorization - @@ -68,7 +68,7 @@ active_sales_rule_for_all_groups payflow_express_authorization_specificcountry_us - - 500 + 400 Processing Authorization - @@ -106,7 +106,7 @@ - payflow_express_sale_specificcountry_gb_line_items Flat Rate/Fixed - 205 + 105 Processing Authorization Completed @@ -124,7 +124,7 @@ - paypal_express_sale_specificcountry_us_shipping_options_mark Flat Rate/Fixed - 315 + 215 Processing Authorization Completed @@ -142,7 +142,7 @@ active_sales_rule_for_all_groups paypal_express_sale_specificcountry_us_shipping_options_mark - - 500 + 400 Processing Authorization Completed diff --git a/dev/tests/functional/tests/app/Mage/Paypal/Test/TestStep/ContinuePayPalCheckoutStep.php b/dev/tests/functional/tests/app/Mage/Paypal/Test/TestStep/ContinuePayPalCheckoutStep.php index 1a293f3125f..81a523ecf9b 100644 --- a/dev/tests/functional/tests/app/Mage/Paypal/Test/TestStep/ContinuePayPalCheckoutStep.php +++ b/dev/tests/functional/tests/app/Mage/Paypal/Test/TestStep/ContinuePayPalCheckoutStep.php @@ -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; @@ -52,13 +51,6 @@ class ContinuePayPalCheckoutStep implements TestStepInterface */ protected $checkoutOnepageSuccess; - /** - * Pay Pal express review page. - * - * @var PaypalExpressReview - */ - protected $paypalExpressReview; - /** * PayPal customer. * @@ -77,17 +69,14 @@ class ContinuePayPalCheckoutStep implements TestStepInterface * @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 @@ public function run() : $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 --git a/dev/tests/functional/tests/app/Mage/SalesRule/Test/Handler/SalesRule/Curl.php b/dev/tests/functional/tests/app/Mage/SalesRule/Test/Handler/SalesRule/Curl.php index 7c3be8629f0..ca341fd0566 100644 --- a/dev/tests/functional/tests/app/Mage/SalesRule/Test/Handler/SalesRule/Curl.php +++ b/dev/tests/functional/tests/app/Mage/SalesRule/Test/Handler/SalesRule/Curl.php @@ -93,6 +93,9 @@ class Curl extends Conditions implements SalesRuleInterface 'aggregator' => 'all', 'value' => '1', ], + 'Customer Segment' => [ + 'type' => 'enterprise_customersegment/segment_condition_segment', + ], 'Category' => [ 'type' => 'salesrule/rule_condition_product', 'attribute' => 'category_ids', diff --git a/dev/tests/functional/tests/app/Mage/Widget/Test/Fixture/Widget.xml b/dev/tests/functional/tests/app/Mage/Widget/Test/Fixture/Widget.xml new file mode 100644 index 00000000000..5b9b9396d19 --- /dev/null +++ b/dev/tests/functional/tests/app/Mage/Widget/Test/Fixture/Widget.xml @@ -0,0 +1,77 @@ + + + + + + Banner Rotator + rwd / enterprise + Test Frontend App + + + all_pages + + default + all + content + widget/block.phtml + + + + + + bannerRotator + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + diff --git a/dev/tests/functional/tests/app/Mage/Widget/Test/Page/Adminhtml/WidgetInstanceEdit.xml b/dev/tests/functional/tests/app/Mage/Widget/Test/Page/Adminhtml/WidgetInstanceEdit.xml index c4cbd7ff6d4..53b9cfec88a 100644 --- a/dev/tests/functional/tests/app/Mage/Widget/Test/Page/Adminhtml/WidgetInstanceEdit.xml +++ b/dev/tests/functional/tests/app/Mage/Widget/Test/Page/Adminhtml/WidgetInstanceEdit.xml @@ -28,6 +28,7 @@ + diff --git a/downloader/Maged/Controller.php b/downloader/Maged/Controller.php index 03644f00d49..ab216ab7a60 100755 --- a/downloader/Maged/Controller.php +++ b/downloader/Maged/Controller.php @@ -1034,7 +1034,7 @@ public static function getVersionInfo() 'major' => '1', 'minor' => '9', 'revision' => '2', - 'patch' => '0', + 'patch' => '1', 'stability' => '', 'number' => '', ); diff --git a/downloader/template/connect/packages_prepare.phtml b/downloader/template/connect/packages_prepare.phtml index ea77729b2dc..86aa51bd422 100644 --- a/downloader/template/connect/packages_prepare.phtml +++ b/downloader/template/connect/packages_prepare.phtml @@ -33,7 +33,6 @@ Extension dependencies
- diff --git a/errors/design.xml b/errors/design.xml index 7a209a272eb..43f76776437 100644 --- a/errors/design.xml +++ b/errors/design.xml @@ -1,28 +1,10 @@ diff --git a/js/extjs/fix-defer-before.js b/js/extjs/fix-defer-before.js index 60957b80ccb..adefbf41325 100644 --- a/js/extjs/fix-defer-before.js +++ b/js/extjs/fix-defer-before.js @@ -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 --git a/js/extjs/fix-defer.js b/js/extjs/fix-defer.js index 79a16b7d3f7..6ae9815ca74 100644 --- a/js/extjs/fix-defer.js +++ b/js/extjs/fix-defer.js @@ -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 --git a/js/lib/jquery/noconflict.js b/js/lib/jquery/noconflict.js index 3ef7a2fac6b..9cb44ccd22c 100644 --- a/js/lib/jquery/noconflict.js +++ b/js/lib/jquery/noconflict.js @@ -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 --git a/lib/flex/varien/varien/upload/Uploader.as b/lib/flex/varien/varien/upload/Uploader.as index 4d0673bb122..e27f6a463ed 100644 --- a/lib/flex/varien/varien/upload/Uploader.as +++ b/lib/flex/varien/varien/upload/Uploader.as @@ -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 --git a/lib/flex/varien/varien/upload/UploaderEvent.as b/lib/flex/varien/varien/upload/UploaderEvent.as index 8f41b5f17d1..6820dbb83d5 100644 --- a/lib/flex/varien/varien/upload/UploaderEvent.as +++ b/lib/flex/varien/varien/upload/UploaderEvent.as @@ -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 --git a/lib/flex/varien/varien/upload/UploaderSingle.as b/lib/flex/varien/varien/upload/UploaderSingle.as index 91495c48a66..9f586e770cd 100644 --- a/lib/flex/varien/varien/upload/UploaderSingle.as +++ b/lib/flex/varien/varien/upload/UploaderSingle.as @@ -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 --git a/pkginfo/.htaccess b/pkginfo/.htaccess deleted file mode 100644 index 93169e4eb44..00000000000 --- a/pkginfo/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -Order deny,allow -Deny from all diff --git a/pkginfo/Mage_All.txt b/pkginfo/Mage_All.txt deleted file mode 100644 index 2ade00a1b9a..00000000000 --- a/pkginfo/Mage_All.txt +++ /dev/null @@ -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 --git a/pkginfo/Mage_All_Latest.txt b/pkginfo/Mage_All_Latest.txt deleted file mode 100644 index 487ff6acd07..00000000000 --- a/pkginfo/Mage_All_Latest.txt +++ /dev/null @@ -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 --git a/shell/abstract.php b/shell/abstract.php index e32716ad6f1..6fe72428c7b 100644 --- a/shell/abstract.php +++ b/shell/abstract.php @@ -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 --git a/shell/compiler.php b/shell/compiler.php index 2bc846efdb5..a83e7742463 100644 --- a/shell/compiler.php +++ b/shell/compiler.php @@ -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 --git a/shell/indexer.php b/shell/indexer.php index fa296394d1c..c660378ba8d 100644 --- a/shell/indexer.php +++ b/shell/indexer.php @@ -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 --git a/shell/log.php b/shell/log.php index 97d00a14ad3..c1c7d56a422 100644 --- a/shell/log.php +++ b/shell/log.php @@ -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 --git a/skin/adminhtml/default/default/below_ie7.css b/skin/adminhtml/default/default/below_ie7.css index 59c21963d85..d8e1ad5637f 100644 --- a/skin/adminhtml/default/default/below_ie7.css +++ b/skin/adminhtml/default/default/below_ie7.css @@ -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 --git a/skin/adminhtml/default/default/boxes.css b/skin/adminhtml/default/default/boxes.css index 298423c2dac..4e7b190b719 100644 --- a/skin/adminhtml/default/default/boxes.css +++ b/skin/adminhtml/default/default/boxes.css @@ -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 --git a/skin/adminhtml/default/default/custom.css b/skin/adminhtml/default/default/custom.css index edcf09febaa..9397382a489 100644 --- a/skin/adminhtml/default/default/custom.css +++ b/skin/adminhtml/default/default/custom.css @@ -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 --git a/skin/adminhtml/default/default/ie7.css b/skin/adminhtml/default/default/ie7.css index df926cfd202..807cd2a1b09 100644 --- a/skin/adminhtml/default/default/ie7.css +++ b/skin/adminhtml/default/default/ie7.css @@ -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 --git a/skin/adminhtml/default/default/iestyles.css b/skin/adminhtml/default/default/iestyles.css index 44e7c5b342f..3073a31975a 100644 --- a/skin/adminhtml/default/default/iestyles.css +++ b/skin/adminhtml/default/default/iestyles.css @@ -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 --git a/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-catalog.css b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-catalog.css index 199021b27ec..b486175018e 100644 --- a/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-catalog.css +++ b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-catalog.css @@ -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; -} - - - -.btn-txt -{ - position:relative; - top:8px; -} -.title -{ - position:relative; - top:0px; - font: bold 19px arial; - color: #e9e9e9; -} -.filter-header -{ - height: 25px; - text-align: center; - vertical-align: middle; -} -.filter-applied -{ - position:relative; - top:5px; -} -.filter-circle -{ - width: 18px; - height: 18px; - background:url('circle.png') center center no-repeat; -} -.filter-text -{ - padding: 0 0 0 5px; - font-size: 11px; -} -.filter-lines -{ - float: right; - width: 25px; - height: 25px; - padding: 0 25px 0 0; - background:url('lines-h.png') center center no-repeat; -} -.sort-block -{ - height: 40px; - text-align: center; -} -.sort-block-inner -{ - position:relative; - top:7px; -} -.sort-block-inner-txt -{ - float: left; - width: 75px; - height: 26px; - padding-top: 12px; -} - -.sort-buttons -{ - text-align: center; - font: bold 10px arial; - float: right; - padding: 0 5px 0 0; -} - -.active -{ - color: #e9e9e9; -} - -.inactive -{ - color: #333; -} - -.item -{ - height: 91px; -} - -.slider -{ - -} - -.slider-item -{ - background: url('actionsBg.png') left center repeat-x; - width: 20%; - height: 100%; - float: left; - text-align: center; -} -.slider-image -{ - position: relative; - top: 20px; -} - -.slider-item-text -{ - position: relative; - top: 30px; -} - -.lines-v -{ - height: 91px; - width: 20px; - background: url('lines-v.png') center center no-repeat; - float: left; -} -.arrow -{ - height: 91px; - width: 20px; - background: url('arrow.png') center center no-repeat; - float: right; -} -.item-image -{ - padding: 10px 0 0 10px; - float: left; -} -.item-info -{ - float: left; - text-align: left; - padding: 10px 0 0 20px; -} -.item-title -{ - padding: 0 0 10px 0; -} - -.item-rate span -{ - position: relative; - top: -2px; - left: 0px; - font: bold 12px arial; - color: #333; -} - -.item-rate -{ - float: left; - display: block; -} - -.bottom-buttons -{ - height: 50px; - width: 320px; - clear: left; - margin-top: -30px; -} -.bottom-button -{ - width: 64px; - height: 26px; - margin-top: 5px; - float: left; -} -.bottom-button p -{ - position:relative; - top:20px; - text-align: center; - font: bold 11px arial; - color: #e9e9e9; -} +/** + * 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 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) + */ +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; +} + + + +.btn-txt +{ + position:relative; + top:8px; +} +.title +{ + position:relative; + top:0px; + font: bold 19px arial; + color: #e9e9e9; +} +.filter-header +{ + height: 25px; + text-align: center; + vertical-align: middle; +} +.filter-applied +{ + position:relative; + top:5px; +} +.filter-circle +{ + width: 18px; + height: 18px; + background:url('circle.png') center center no-repeat; +} +.filter-text +{ + padding: 0 0 0 5px; + font-size: 11px; +} +.filter-lines +{ + float: right; + width: 25px; + height: 25px; + padding: 0 25px 0 0; + background:url('lines-h.png') center center no-repeat; +} +.sort-block +{ + height: 40px; + text-align: center; +} +.sort-block-inner +{ + position:relative; + top:7px; +} +.sort-block-inner-txt +{ + float: left; + width: 75px; + height: 26px; + padding-top: 12px; +} + +.sort-buttons +{ + text-align: center; + font: bold 10px arial; + float: right; + padding: 0 5px 0 0; +} + +.active +{ + color: #e9e9e9; +} + +.inactive +{ + color: #333; +} + +.item +{ + height: 91px; +} + +.slider +{ + +} + +.slider-item +{ + background: url('actionsBg.png') left center repeat-x; + width: 20%; + height: 100%; + float: left; + text-align: center; +} +.slider-image +{ + position: relative; + top: 20px; +} + +.slider-item-text +{ + position: relative; + top: 30px; +} + +.lines-v +{ + height: 91px; + width: 20px; + background: url('lines-v.png') center center no-repeat; + float: left; +} +.arrow +{ + height: 91px; + width: 20px; + background: url('arrow.png') center center no-repeat; + float: right; +} +.item-image +{ + padding: 10px 0 0 10px; + float: left; +} +.item-info +{ + float: left; + text-align: left; + padding: 10px 0 0 20px; +} +.item-title +{ + padding: 0 0 10px 0; +} + +.item-rate span +{ + position: relative; + top: -2px; + left: 0px; + font: bold 12px arial; + color: #333; +} + +.item-rate +{ + float: left; + display: block; +} + +.bottom-buttons +{ + height: 50px; + width: 320px; + clear: left; + margin-top: -30px; +} +.bottom-button +{ + width: 64px; + height: 26px; + margin-top: 5px; + float: left; +} +.bottom-button p +{ + position:relative; + top:20px; + text-align: center; + font: bold 11px arial; + color: #e9e9e9; +} diff --git a/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-home.css b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-home.css index f175161edf9..6d0266a7e11 100644 --- a/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-home.css +++ b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-home.css @@ -1,181 +1,205 @@ -body { margin: 0; padding: 0 } - -.main-block -{ - width: 320px; - height: 490px; -} -.header-sign-1 -{ - position:relative; - left:6px; - top:3px; - font: bold 12px arial; - color: #e9e9e9; - float: left; - vertical-align: baseline; - height: 16px; -} -.top-header -{ - height: 20px -} - -.battery -{ - height: 16px; - width: 25px; - float: right; - margin-right: 5px; -} - -.volume -{ - height: 16px; - width: 23px; - float: left; -} - -.antenna -{ - height: 16px; - width: 18px; - float: left; - padding-left: 10px; -} -.time -{ - width: 50%; - position:relative; - top:3px; - text-align: center; - font: bold 12px arial; - color: #e9e9e9; - float: left; -} - -.main-header -{ - height: 44px; - text-align: center; -} -.clearB -{ - clear: both; - height: 1px; -} - -.info -{ - position: relative; - top: 10px; - left: 10px; - float: left; -} -.logo-small -{ - display: inline; - position: relative; - top: 10px; -} - -.login-btn -{ - float: right; - height: 28px; - font: bold 13px arial; - color: #e9e9e9; - padding: 7px 15px 0 0; - -} -.login-body -{ - float: left; - width: 50px; - height: 100%; - background:url('../img/login-btn.png') center center repeat-x; -} -.login-body span -{ - position: relative; - top: 5px; - left: 0px; -} -.login-left -{ - float: left; - height: 100%; - font: bold 3px arial; - background:url('../img/login-btn-left.png') center center no-repeat; -} -.login-right -{ - float: left; - height: 100%; - font: bold 3px arial; - background:url('../img/login-btn-right.png') center center no-repeat; -} -.title -{ - position:relative; - top:10px; - font: bold 19px arial; - color: #e9e9e9; -} -.main-header-text -{ - width: 10px; -} - -.big-logo -{ - text-align: center; - padding: 5px 0 0 0; -} -.catalog -{ - height: 210px; -} -.item -{ - float: left; - padding: 5px 0 0 5px; - text-align: center; - margin: 25px 7px 0 7px; - width: 82px; - height: 108; -} -.item-image -{ - padding: 10px 0 10px 0; - text-align: center; -} - -.item-text -{ - height: 18px; - width: 82px; - text-align: center; -} -.bottom-buttons -{ - height: 50px; - position: relative; - bottom: 50px; - left: 0px; -} -.bottom-button -{ - width: 64px; - height: 26px; - margin-top: 5px; - float: left; -} -.bottom-button p -{ - position:relative; - top:20px; - text-align: center; - font: bold 11px arial; - color: #e9e9e9; -} \ No newline at end of file +/** + * 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 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) + */ +body { margin: 0; padding: 0 } + +.main-block +{ + width: 320px; + height: 490px; +} +.header-sign-1 +{ + position:relative; + left:6px; + top:3px; + font: bold 12px arial; + color: #e9e9e9; + float: left; + vertical-align: baseline; + height: 16px; +} +.top-header +{ + height: 20px +} + +.battery +{ + height: 16px; + width: 25px; + float: right; + margin-right: 5px; +} + +.volume +{ + height: 16px; + width: 23px; + float: left; +} + +.antenna +{ + height: 16px; + width: 18px; + float: left; + padding-left: 10px; +} +.time +{ + width: 50%; + position:relative; + top:3px; + text-align: center; + font: bold 12px arial; + color: #e9e9e9; + float: left; +} + +.main-header +{ + height: 44px; + text-align: center; +} +.clearB +{ + clear: both; + height: 1px; +} + +.info +{ + position: relative; + top: 10px; + left: 10px; + float: left; +} +.logo-small +{ + display: inline; + position: relative; + top: 10px; +} + +.login-btn +{ + float: right; + height: 28px; + font: bold 13px arial; + color: #e9e9e9; + padding: 7px 15px 0 0; + +} +.login-body +{ + float: left; + width: 50px; + height: 100%; + background:url('../img/login-btn.png') center center repeat-x; +} +.login-body span +{ + position: relative; + top: 5px; + left: 0px; +} +.login-left +{ + float: left; + height: 100%; + font: bold 3px arial; + background:url('../img/login-btn-left.png') center center no-repeat; +} +.login-right +{ + float: left; + height: 100%; + font: bold 3px arial; + background:url('../img/login-btn-right.png') center center no-repeat; +} +.title +{ + position:relative; + top:10px; + font: bold 19px arial; + color: #e9e9e9; +} +.main-header-text +{ + width: 10px; +} + +.big-logo +{ + text-align: center; + padding: 5px 0 0 0; +} +.catalog +{ + height: 210px; +} +.item +{ + float: left; + padding: 5px 0 0 5px; + text-align: center; + margin: 25px 7px 0 7px; + width: 82px; + height: 108; +} +.item-image +{ + padding: 10px 0 10px 0; + text-align: center; +} + +.item-text +{ + height: 18px; + width: 82px; + text-align: center; +} +.bottom-buttons +{ + height: 50px; + position: relative; + bottom: 50px; + left: 0px; +} +.bottom-button +{ + width: 64px; + height: 26px; + margin-top: 5px; + float: left; +} +.bottom-button p +{ + position:relative; + top:20px; + text-align: center; + font: bold 11px arial; + color: #e9e9e9; +} diff --git a/skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css b/skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css index f3a39f90e0f..b9841f371cf 100644 --- a/skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css +++ b/skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css @@ -1,3 +1,27 @@ +/** + * 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 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) + */ .dialog { border:1px solid #555; } .dialog .bot { display:none !important; } .overlay_magento { background-color:#000; filter:alpha(opacity=60); -moz-opacity:.6; opacity:.6; -webkit-opacity:.6; } diff --git a/skin/adminhtml/default/default/menu.css b/skin/adminhtml/default/default/menu.css index 567c0ab8062..3da4edb6088 100644 --- a/skin/adminhtml/default/default/menu.css +++ b/skin/adminhtml/default/default/menu.css @@ -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) */ .nav-bar { border-top:1px solid #2d444f; border-bottom:1px solid #2d444f; background:url(images/nav1_bg.gif) repeat-x 0 100% #666e73; padding:0 30px; } @@ -96,4 +98,4 @@ #nav li.over ul li.over ul ul { left:-10000px;} #nav li.over ul li.over ul li.over ul { left:100px; } -.nav-bar:after { content:"."; display:block; clear:both; font-size:0; line-height:0; height:0; overflow:hidden; } \ No newline at end of file +.nav-bar:after { content:"."; display:block; clear:both; font-size:0; line-height:0; height:0; overflow:hidden; } diff --git a/skin/adminhtml/default/default/oauth-simple.css b/skin/adminhtml/default/default/oauth-simple.css index abc19e2734b..85c81e02c66 100644 --- a/skin/adminhtml/default/default/oauth-simple.css +++ b/skin/adminhtml/default/default/oauth-simple.css @@ -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 base_default - * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com) + * @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 --git a/skin/adminhtml/default/default/print.css b/skin/adminhtml/default/default/print.css index fcb69d39665..50f46bf753a 100644 --- a/skin/adminhtml/default/default/print.css +++ b/skin/adminhtml/default/default/print.css @@ -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) */ * { background:none !important; text-align:left !important; } @@ -36,4 +38,4 @@ th,td { color:#333 !important; border-color:#ccc !important; } #sales_order_grid_massaction, .content-header-floating, .content-header .form-buttons, -.footer { display:none !important; } \ No newline at end of file +.footer { display:none !important; } diff --git a/skin/adminhtml/default/default/reset.css b/skin/adminhtml/default/default/reset.css index b15a76eb926..6b1bf69abbf 100644 --- a/skin/adminhtml/default/default/reset.css +++ b/skin/adminhtml/default/default/reset.css @@ -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) */ /******************************************/ /***************** BASE *******************/ @@ -70,4 +72,4 @@ dt { display:block; } /* Size */ small { font-size:.9em; } -big { font-size:1.25em; } \ No newline at end of file +big { font-size:1.25em; } diff --git a/skin/adminhtml/default/default/xmlconnect/boxes.css b/skin/adminhtml/default/default/xmlconnect/boxes.css index 0a4cf3073b1..c6cfd198544 100644 --- a/skin/adminhtml/default/default/xmlconnect/boxes.css +++ b/skin/adminhtml/default/default/xmlconnect/boxes.css @@ -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) 2010 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) */ .mm_ctrl .m-arrows { width:42px; height:17px; text-indent:-2000em; background:url(../images/xmlconnect/r-arrow.gif) no-repeat 0 0; border:0; float:left; cursor:pointer; } diff --git a/skin/adminhtml/default/default/xmlconnect/dropdown.css b/skin/adminhtml/default/default/xmlconnect/dropdown.css index e847ee5e733..267ef21e126 100644 --- a/skin/adminhtml/default/default/xmlconnect/dropdown.css +++ b/skin/adminhtml/default/default/xmlconnect/dropdown.css @@ -1,3 +1,27 @@ +/** + * 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 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) + */ .dropdown { float:left; width:200px; border:1px solid #ccc; position:relative; } .dropdown a { padding:3px 18px 3px 10px ; display:block; text-decoration:none; color:#000; position:relative; } .dropdown a:hover { background:#ccc; } @@ -6,4 +30,4 @@ .dropdown li.ddtitle a:hover { background:url(../images/xmlconnect/dropdown-arrow.gif) 100% 8px no-repeat; } .dropdown li.ddlist { background:#fff; left:0; position:absolute; border:1px solid #ccc; border-top:0; width:200px; margin:-1px 0 0 -1px !important; padding:1px 0 0 0; } .dropdown li { zoom:1; } -/* .accordion dt { background:red !important; } */ \ No newline at end of file +/* .accordion dt { background:red !important; } */ diff --git a/skin/adminhtml/default/default/xmlconnect/iestyles.css b/skin/adminhtml/default/default/xmlconnect/iestyles.css index cc70e448521..7c924b4ef82 100644 --- a/skin/adminhtml/default/default/xmlconnect/iestyles.css +++ b/skin/adminhtml/default/default/xmlconnect/iestyles.css @@ -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) 2010 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) */ *+html .image-item, diff --git a/skin/adminhtml/default/default/xmlconnect/mobile-android.css b/skin/adminhtml/default/default/xmlconnect/mobile-android.css index 88a6f10dc39..9d1f9d00551 100644 --- a/skin/adminhtml/default/default/xmlconnect/mobile-android.css +++ b/skin/adminhtml/default/default/xmlconnect/mobile-android.css @@ -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) 2010 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) */ @font-face { @@ -285,4 +287,4 @@ .catalog-page .cat-list .col-2 .availability { color:#222; font-size:11px; - } \ No newline at end of file + } diff --git a/skin/adminhtml/default/default/xmlconnect/mobile-catalog.css b/skin/adminhtml/default/default/xmlconnect/mobile-catalog.css index 77b3c84686f..5578ff1b4f8 100644 --- a/skin/adminhtml/default/default/xmlconnect/mobile-catalog.css +++ b/skin/adminhtml/default/default/xmlconnect/mobile-catalog.css @@ -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) 2010 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) */ @font-face { @@ -54,7 +56,7 @@ .iphone-catalog .logo-small div { width:165px; height:41px; overflow:hidden; text-align:center; vertical-align:middle; } .iphone-catalog .logo-small img { vertical-align:middle; } .iphone-catalog .logo-small .sh-title { text-align:left; height:30px; vertical-align:middle; } -.iphone-catalog .logo-small .sh-title1, +.iphone-catalog .logo-small .sh-title1, .iphone-catalog .logo-small .sh-title2 { font:bold 16px/44px arial !important; color:#000; position:relative; } .iphone-catalog .logo-small .sh-title1 { display:inline-block; } .iphone-catalog .logo-small .sh-title2 { color:#fff; position:absolute; top:-1px; left:-1px; } @@ -80,7 +82,7 @@ .iphone-catalog .sort-block .button-price { -moz-border-radius:0 5px 5px 0; -webkit-border-radius:0 5px 5px 0; border-radius:0 5px 5px 0; } .iphone-catalog .sort-block .button img { vertical-align:middle; } .iphone-catalog .active { color:#e9e9e9; } -.iphone-catalog .inactive { color:#333; } +.iphone-catalog .inactive { color:#333; } .iphone-catalog .item { font-family:Helvetica, "Helvetica Neue", Arial, sans-serif; height:91px; position:relative; } .iphone-catalog .item .gradient { height:88px; width:100%; position:absolute; bottom:0; background:url(../images/xmlconnect/mobile_preview/gradients/item-bg.png) 0 0 repeat-x; left:0; } .iphone-catalog .slider { background:url('../images/xmlconnect/mobile_preview/actionsBg.png') left center repeat-x; } @@ -104,7 +106,7 @@ .iphone-catalog .item-rate .stars { font-family:stars; font-size:16px; vertical-align:middle; } .iphone-catalog .item-rate .star { vertical-align:top; } .iphone-catalog .item-rate strong { font-size:10px; line-height:16px; vertical-align:text-top; } -.iphone-catalog .item-rate {} +.iphone-catalog .item-rate {} .iphone-catalog .bottom-buttons { height:48px; position:absolute; bottom:0; background:#060606; width:320px; } .iphone-catalog .bottom-buttons .gradient { position:absolute; width:320px; background:url(../images/xmlconnect/mobile_preview/gradients/footer.png) 0 0 no-repeat !important; } .iphone-catalog .bottom-button { height:26px; vertical-align:top; } diff --git a/skin/adminhtml/default/default/xmlconnect/mobile-home.css b/skin/adminhtml/default/default/xmlconnect/mobile-home.css index 5c5970bfe11..3eef6573b43 100644 --- a/skin/adminhtml/default/default/xmlconnect/mobile-home.css +++ b/skin/adminhtml/default/default/xmlconnect/mobile-home.css @@ -9,18 +9,20 @@ * 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) 2010 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) */ - + .iphone-home .main-frame { background:url(../images/xmlconnect/mobile_preview/mm-frame.gif) 0 0 no-repeat; line-height:1; margin:0 0 10px; padding:4px; } .iphone-home .main-block { position:relative; height:478px; width:320px; overflow:hidden; } .iphone-home .header-sign-1 { font:bold 13px/19px arial !important; color:#e9e9e9; float:left; padding:0 15px 0 6px; } @@ -41,7 +43,7 @@ .iphone-home .logo-small div { width:200px; height:41px; overflow:hidden; text-align:center; vertical-align:middle; } .iphone-home .logo-small img { vertical-align:middle; } .iphone-home .logo-small .sh-title { text-align:left; height:30px; vertical-align:middle; } -.iphone-home .logo-small .sh-title1, +.iphone-home .logo-small .sh-title1, .iphone-home .logo-small .sh-title2 { font:bold 16px/44px arial !important; color:#000; position:relative; } .iphone-home .logo-small .sh-title1 { display:inline-block; } .iphone-home .logo-small .sh-title2 { color:#fff; position:absolute; top:-1px; left:-1px; } diff --git a/skin/adminhtml/default/default/xmlconnect/mobile-ipad-catalog.css b/skin/adminhtml/default/default/xmlconnect/mobile-ipad-catalog.css index fafad2f2b03..c1264e23553 100644 --- a/skin/adminhtml/default/default/xmlconnect/mobile-ipad-catalog.css +++ b/skin/adminhtml/default/default/xmlconnect/mobile-ipad-catalog.css @@ -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) 2010 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) */ @font-face { @@ -284,4 +286,4 @@ } .ipad-catalog-landscape .sections .active { background:#f2f2f2; - } \ No newline at end of file + } diff --git a/skin/adminhtml/default/default/xmlconnect/mobile-ipad-home.css b/skin/adminhtml/default/default/xmlconnect/mobile-ipad-home.css index a9a89fd0aba..da749781fba 100644 --- a/skin/adminhtml/default/default/xmlconnect/mobile-ipad-home.css +++ b/skin/adminhtml/default/default/xmlconnect/mobile-ipad-home.css @@ -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) 2010 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) */ .ipad { diff --git a/skin/adminhtml/default/default/xmlconnect/styles.css b/skin/adminhtml/default/default/xmlconnect/styles.css index a0d1cc9f497..420a1a9514e 100644 --- a/skin/adminhtml/default/default/xmlconnect/styles.css +++ b/skin/adminhtml/default/default/xmlconnect/styles.css @@ -1,3 +1,27 @@ +/** + * 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 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) + */ .wrapper { min-width:1150px !important; } .theme_selector ul, .theme_selector li { diff --git a/skin/frontend/default/blue/css/styles-ie.css b/skin/frontend/default/blue/css/styles-ie.css index 0c32fbd5167..5de6b46e082 100644 --- a/skin/frontend/default/blue/css/styles-ie.css +++ b/skin/frontend/default/blue/css/styles-ie.css @@ -18,7 +18,7 @@ * needs please refer to http://www.magento.com for more information. * * @category design - * @package default_default + * @package default_blue * @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 --git a/skin/frontend/default/blue/css/styles.css b/skin/frontend/default/blue/css/styles.css index d5628332880..d5c0dd6ee66 100644 --- a/skin/frontend/default/blue/css/styles.css +++ b/skin/frontend/default/blue/css/styles.css @@ -18,7 +18,7 @@ * needs please refer to http://www.magento.com for more information. * * @category design - * @package default_default + * @package default_blue * @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 --git a/skin/frontend/rwd/default/js/lib/elevatezoom/jquery.elevateZoom-3.0.8.min.js b/skin/frontend/rwd/default/js/lib/elevatezoom/jquery.elevateZoom-3.0.8.min.js index eb1ee353f51..e661087eb7f 100644 --- a/skin/frontend/rwd/default/js/lib/elevatezoom/jquery.elevateZoom-3.0.8.min.js +++ b/skin/frontend/rwd/default/js/lib/elevatezoom/jquery.elevateZoom-3.0.8.min.js @@ -1,27 +1,3 @@ -/** - * 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 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) - */ /* jQuery elevateZoom 3.0.8 - Demo's and documentation: - www.elevateweb.co.uk/image-zoom - Copyright (c) 2013 Andrew Eades - www.elevateweb.co.uk - Dual licensed under the LGPL licenses. - http://en.wikipedia.org/wiki/MIT_License - http://en.wikipedia.org/wiki/GNU_General_Public_License */ "function"!==typeof Object.create&&(Object.create=function(d){function h(){}h.prototype=d;return new h}); (function(d,h,l,m){var k={init:function(b,a){var c=this;c.elem=a;c.$elem=d(a);c.imageSrc=c.$elem.data("zoom-image")?c.$elem.data("zoom-image"):c.$elem.attr("src");c.options=d.extend({},d.fn.elevateZoom.options,b);c.options.tint&&(c.options.lensColour="none",c.options.lensOpacity="1");"inner"==c.options.zoomType&&(c.options.showLens=!1);c.$elem.parent().removeAttr("title").removeAttr("alt");c.zoomImage=c.imageSrc;c.refresh(1);d("#"+c.options.gallery+" a").click(function(a){c.options.galleryActiveClass&& diff --git a/skin/frontend/rwd/default/js/lib/elevatezoom/jquery.elevatezoom.js b/skin/frontend/rwd/default/js/lib/elevatezoom/jquery.elevatezoom.js index d94c891c56b..b010664be92 100644 --- a/skin/frontend/rwd/default/js/lib/elevatezoom/jquery.elevatezoom.js +++ b/skin/frontend/rwd/default/js/lib/elevatezoom/jquery.elevatezoom.js @@ -1,27 +1,3 @@ -/** - * 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 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) - */ /* * jQuery elevateZoom 3.0.8 * Demo's and documentation: diff --git a/skin/frontend/rwd/default/js/lib/enquire.js b/skin/frontend/rwd/default/js/lib/enquire.js index a006b07c352..187793192f0 100644 --- a/skin/frontend/rwd/default/js/lib/enquire.js +++ b/skin/frontend/rwd/default/js/lib/enquire.js @@ -1,27 +1,3 @@ -/** - * 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 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) - */ /*! * enquire.js v2.1.0 - Awesome Media Queries in JavaScript * Copyright (c) 2013 Nick Williams - http://wicky.nillia.ms/enquire.js diff --git a/skin/frontend/rwd/default/js/lib/fastclick.js b/skin/frontend/rwd/default/js/lib/fastclick.js index 00683ce294a..67b4736baf6 100644 --- a/skin/frontend/rwd/default/js/lib/fastclick.js +++ b/skin/frontend/rwd/default/js/lib/fastclick.js @@ -1,27 +1,3 @@ -/** - * 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 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) - */ /** * @preserve FastClick: polyfill to remove click delays on browsers with touch UIs. * diff --git a/skin/frontend/rwd/default/js/lib/imagesloaded.js b/skin/frontend/rwd/default/js/lib/imagesloaded.js index 13fcad1c011..85ddd929f76 100644 --- a/skin/frontend/rwd/default/js/lib/imagesloaded.js +++ b/skin/frontend/rwd/default/js/lib/imagesloaded.js @@ -1,27 +1,3 @@ -/** - * 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 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) - */ /*! * imagesLoaded PACKAGED v3.1.4 * JavaScript is all like "You images are done yet or what?" diff --git a/skin/frontend/rwd/default/js/lib/jquery.cycle2.min.js b/skin/frontend/rwd/default/js/lib/jquery.cycle2.min.js index b9a08ad9c16..443bc2c55b0 100644 --- a/skin/frontend/rwd/default/js/lib/jquery.cycle2.min.js +++ b/skin/frontend/rwd/default/js/lib/jquery.cycle2.min.js @@ -1,27 +1,3 @@ -/** - * 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 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) - */ /*! * jQuery Cycle2; build: v20131022 * http://jquery.malsup.com/cycle2/ diff --git a/skin/frontend/rwd/default/js/lib/jquery.cycle2.swipe.min.js b/skin/frontend/rwd/default/js/lib/jquery.cycle2.swipe.min.js index 25a072fca46..dba6584f010 100644 --- a/skin/frontend/rwd/default/js/lib/jquery.cycle2.swipe.min.js +++ b/skin/frontend/rwd/default/js/lib/jquery.cycle2.swipe.min.js @@ -1,26 +1,2 @@ -/** - * 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 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) - */ /*! Plugin for Cycle2; Copyright (c) 2012 M. Alsup; ver: 20121120 */ (function(a){"use strict";var b="ontouchend"in document;a.event.special.swipe=a.event.special.swipe||{scrollSupressionThreshold:10,durationThreshold:1e3,horizontalDistanceThreshold:30,verticalDistanceThreshold:75,setup:function(){var b=a(this);b.bind("touchstart",function(c){function g(b){if(!f)return;var c=b.originalEvent.touches?b.originalEvent.touches[0]:b;e={time:(new Date).getTime(),coords:[c.pageX,c.pageY]},Math.abs(f.coords[0]-e.coords[0])>a.event.special.swipe.scrollSupressionThreshold&&b.preventDefault()}var d=c.originalEvent.touches?c.originalEvent.touches[0]:c,e,f={time:(new Date).getTime(),coords:[d.pageX,d.pageY],origin:a(c.target)};b.bind("touchmove",g).one("touchend",function(c){b.unbind("touchmove",g),f&&e&&e.time-f.timea.event.special.swipe.horizontalDistanceThreshold&&Math.abs(f.coords[1]-e.coords[1])e.coords[0]?"swipeleft":"swiperight"),f=e=undefined})})}},a.event.special.swipeleft=a.event.special.swipeleft||{setup:function(){a(this).bind("swipe",a.noop)}},a.event.special.swiperight=a.event.special.swiperight||a.event.special.swipeleft})(jQuery); diff --git a/skin/frontend/rwd/default/js/lib/matchMedia.addListener.js b/skin/frontend/rwd/default/js/lib/matchMedia.addListener.js index 4cdedbe09fd..764232d949c 100644 --- a/skin/frontend/rwd/default/js/lib/matchMedia.addListener.js +++ b/skin/frontend/rwd/default/js/lib/matchMedia.addListener.js @@ -1,27 +1,3 @@ -/** - * 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 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) - */ /*! matchMedia() polyfill addListener/removeListener extension. Author & copyright (c) 2012: Scott Jehl. Dual MIT/BSD license */ (function(){ // Bail out for browsers that have addListener support diff --git a/skin/frontend/rwd/default/js/lib/matchMedia.js b/skin/frontend/rwd/default/js/lib/matchMedia.js index 34662bffa42..0bfca11e6d1 100644 --- a/skin/frontend/rwd/default/js/lib/matchMedia.js +++ b/skin/frontend/rwd/default/js/lib/matchMedia.js @@ -1,27 +1,3 @@ -/** - * 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 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) - */ /*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas, David Knight. Dual MIT/BSD license */ window.matchMedia || (window.matchMedia = function() { diff --git a/skin/frontend/rwd/default/js/lib/modernizr.custom.min.js b/skin/frontend/rwd/default/js/lib/modernizr.custom.min.js index f43d7f04ef4..74e4236c7d8 100644 --- a/skin/frontend/rwd/default/js/lib/modernizr.custom.min.js +++ b/skin/frontend/rwd/default/js/lib/modernizr.custom.min.js @@ -1,27 +1,3 @@ -/** - * 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 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) - */ /* Modernizr 2.6.2 (Custom Build) | MIT & BSD * Build: http://modernizr.com/download/#-localstorage-touch-shiv-mq-cssclasses-teststyles-prefixes-load */ diff --git a/skin/frontend/rwd/default/js/lib/selectivizr.js b/skin/frontend/rwd/default/js/lib/selectivizr.js index e729f0ef39d..3a156944e02 100644 --- a/skin/frontend/rwd/default/js/lib/selectivizr.js +++ b/skin/frontend/rwd/default/js/lib/selectivizr.js @@ -1,27 +1,3 @@ -/** - * 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 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) - */ /* selectivizr v1.0.2 - (c) Keith Clark, freely distributable under the terms of the MIT license. diff --git a/skin/frontend/rwd/default/scss/vendor/_normalize.scss b/skin/frontend/rwd/default/scss/vendor/_normalize.scss index 70ec05b9af1..57b5d2679ae 100644 --- a/skin/frontend/rwd/default/scss/vendor/_normalize.scss +++ b/skin/frontend/rwd/default/scss/vendor/_normalize.scss @@ -1,28 +1,3 @@ -// -// 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 design -// @package rwd_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) -// - /*! normalize.css v2.0.1 | MIT License | git.io/normalize */ /* ========================================================================== diff --git a/skin/install/default/default/css/boxes.css b/skin/install/default/default/css/boxes.css index cb03ca485d5..f13fd386acf 100644 --- a/skin/install/default/default/css/boxes.css +++ b/skin/install/default/default/css/boxes.css @@ -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) */ /****************************************************/ diff --git a/skin/install/default/default/css/clears.css b/skin/install/default/default/css/clears.css index ee2fa02eaba..9b885ac17db 100644 --- a/skin/install/default/default/css/clears.css +++ b/skin/install/default/default/css/clears.css @@ -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) */ /****************************************************/ diff --git a/skin/install/default/default/css/ie7minus.css b/skin/install/default/default/css/ie7minus.css index c51e890fdbf..8ca1d36cb83 100644 --- a/skin/install/default/default/css/ie7minus.css +++ b/skin/install/default/default/css/ie7minus.css @@ -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) */ h1#logo { display:inline; } diff --git a/skin/install/default/default/css/iestyles.css b/skin/install/default/default/css/iestyles.css index 7e6a7ae1de7..8be93795dee 100644 --- a/skin/install/default/default/css/iestyles.css +++ b/skin/install/default/default/css/iestyles.css @@ -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) */ .col2-set, .col3-set, diff --git a/skin/install/default/default/css/reset.css b/skin/install/default/default/css/reset.css index 3ec0e2287a8..f53511937dd 100644 --- a/skin/install/default/default/css/reset.css +++ b/skin/install/default/default/css/reset.css @@ -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) */ /******************************************/ /***********[ Mage_CSS_A Reset ]***********/ diff --git a/var/package/Cm_RedisSession-1.9.2.0.xml b/var/package/Cm_RedisSession-1.9.2.1.xml similarity index 85% rename from var/package/Cm_RedisSession-1.9.2.0.xml rename to var/package/Cm_RedisSession-1.9.2.1.xml index 434a4758206..8f57c52bef6 100644 --- a/var/package/Cm_RedisSession-1.9.2.0.xml +++ b/var/package/Cm_RedisSession-1.9.2.1.xml @@ -1,18 +1,18 @@ Cm_RedisSession - 1.9.2.0 + 1.9.2.1 stable New BSD community Redis session Redis seesion - 1.9.2.0 + 1.9.2.1 Colin Mollenhourcorecolin@mollenhour.com - 2015-06-25 - + 2015-07-29 + - 5.2.06.0.0Lib_Crediscommunity1.9.2.01.9.2.0 + 5.2.06.0.0Lib_Crediscommunity1.9.2.11.9.2.1 diff --git a/var/package/Interface_Adminhtml_Default-1.9.2.0.xml b/var/package/Interface_Adminhtml_Default-1.9.2.1.xml similarity index 98% rename from var/package/Interface_Adminhtml_Default-1.9.2.0.xml rename to var/package/Interface_Adminhtml_Default-1.9.2.1.xml index 7d93e77dbf5..3ef3b0f5a79 100644 --- a/var/package/Interface_Adminhtml_Default-1.9.2.0.xml +++ b/var/package/Interface_Adminhtml_Default-1.9.2.1.xml @@ -1,18 +1,18 @@ Interface_Adminhtml_Default - 1.9.2.0 + 1.9.2.1 stable AFL v3.0 community Default interface for Adminhtml Default interface for Adminhtml - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - - + 2015-07-29 + + - 5.2.06.0.0Mage_Core_Adminhtmlcommunity1.9.2.01.9.2.0Lib_Js_Extcommunity1.7.0.01.7.0.0 + 5.2.06.0.0Mage_Core_Adminhtmlcommunity1.9.2.11.9.2.1Lib_Js_Extcommunity1.9.2.11.9.2.1 diff --git a/var/package/Interface_Frontend_Base_Default-1.9.2.0.xml b/var/package/Interface_Frontend_Base_Default-1.9.2.1.xml similarity index 99% rename from var/package/Interface_Frontend_Base_Default-1.9.2.0.xml rename to var/package/Interface_Frontend_Base_Default-1.9.2.1.xml index b62aa92cbf9..fc5f7dd02e3 100644 --- a/var/package/Interface_Frontend_Base_Default-1.9.2.0.xml +++ b/var/package/Interface_Frontend_Base_Default-1.9.2.1.xml @@ -1,18 +1,18 @@ Interface_Frontend_Base_Default - 1.9.2.0 + 1.9.2.1 stable AFL v3.0 community This is a Magento themes base This is a Magento themes base - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - - + 2015-07-29 + + - 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.01.9.2.0 + 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.11.9.2.1 diff --git a/var/package/Interface_Frontend_Default-1.9.2.0.xml b/var/package/Interface_Frontend_Default-1.9.2.1.xml similarity index 98% rename from var/package/Interface_Frontend_Default-1.9.2.0.xml rename to var/package/Interface_Frontend_Default-1.9.2.1.xml index 83a2de3737b..04ba0789099 100644 --- a/var/package/Interface_Frontend_Default-1.9.2.0.xml +++ b/var/package/Interface_Frontend_Default-1.9.2.1.xml @@ -1,18 +1,18 @@ Interface_Frontend_Default - 1.9.2.0 + 1.9.2.1 stable AFL v3.0 community Default interface for Frontend Default interface for Frontend - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - + 2015-07-29 + - 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.01.9.2.0 + 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.11.9.2.1 diff --git a/var/package/Interface_Frontend_Rwd_Default-1.9.2.0.xml b/var/package/Interface_Frontend_Rwd_Default-1.9.2.1.xml similarity index 96% rename from var/package/Interface_Frontend_Rwd_Default-1.9.2.0.xml rename to var/package/Interface_Frontend_Rwd_Default-1.9.2.1.xml index 50a78f06c02..953aa2b6ddf 100644 --- a/var/package/Interface_Frontend_Rwd_Default-1.9.2.0.xml +++ b/var/package/Interface_Frontend_Rwd_Default-1.9.2.1.xml @@ -1,18 +1,18 @@ Interface_Frontend_Rwd_Default - 1.9.2.0 + 1.9.2.1 stable AFL v3.0 community This is a RWD themes base This is a RWD themes base - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - - + 2015-07-29 + + - 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.01.9.2.0 + 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.11.9.2.1 diff --git a/var/package/Interface_Install_Default-1.9.2.0.xml b/var/package/Interface_Install_Default-1.9.2.1.xml similarity index 87% rename from var/package/Interface_Install_Default-1.9.2.0.xml rename to var/package/Interface_Install_Default-1.9.2.1.xml index f7ff8b27522..fa255e9a48c 100644 --- a/var/package/Interface_Install_Default-1.9.2.0.xml +++ b/var/package/Interface_Install_Default-1.9.2.1.xml @@ -1,18 +1,18 @@ Interface_Install_Default - 1.9.2.0 + 1.9.2.1 stable AFL v3.0 community Default interface for Install Default interface for Install - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - - + 2015-07-29 + + - 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.01.9.2.0 + 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.11.9.2.1 diff --git a/var/package/Lib_Cm-1.9.2.0.xml b/var/package/Lib_Cm-1.9.2.1.xml similarity index 82% rename from var/package/Lib_Cm-1.9.2.0.xml rename to var/package/Lib_Cm-1.9.2.1.xml index a24f97d8d77..4d573cc13fb 100644 --- a/var/package/Lib_Cm-1.9.2.0.xml +++ b/var/package/Lib_Cm-1.9.2.1.xml @@ -1,18 +1,18 @@ Lib_Cm - 1.9.2.0 + 1.9.2.1 stable New BSD community Redis adapter for Zend_Cache Redis adapter for Zend_Cache - 1.9.2.0 + 1.9.2.1 Colin Mollenhourcorecolin@mollenhour.com - 2015-06-25 - + 2015-07-29 + - 5.2.06.0.0Lib_Crediscommunity1.9.2.01.9.2.0 + 5.2.06.0.0Lib_Crediscommunity1.9.2.11.9.2.1 diff --git a/var/package/Lib_Credis-1.9.2.0.xml b/var/package/Lib_Credis-1.9.2.1.xml similarity index 86% rename from var/package/Lib_Credis-1.9.2.0.xml rename to var/package/Lib_Credis-1.9.2.1.xml index f8aed7ec885..088d6b425c4 100644 --- a/var/package/Lib_Credis-1.9.2.0.xml +++ b/var/package/Lib_Credis-1.9.2.1.xml @@ -1,17 +1,17 @@ Lib_Credis - 1.9.2.0 + 1.9.2.1 stable OSL v3.0 community Credis Library Credis Library - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - + 2015-07-29 + 5.2.06.0.0 diff --git a/var/package/Lib_Google_Checkout-1.9.2.0.xml b/var/package/Lib_Google_Checkout-1.9.2.1.xml similarity index 83% rename from var/package/Lib_Google_Checkout-1.9.2.0.xml rename to var/package/Lib_Google_Checkout-1.9.2.1.xml index ced27e1441c..ee5c30ebbd6 100644 --- a/var/package/Lib_Google_Checkout-1.9.2.0.xml +++ b/var/package/Lib_Google_Checkout-1.9.2.1.xml @@ -1,17 +1,17 @@ Lib_Google_Checkout - 1.9.2.0 + 1.9.2.1 stable Apache License community Google Checkout Library Google Checkout Library - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - + 2015-07-29 + 5.2.06.0.0 diff --git a/var/package/Lib_IDNA2-1.9.2.0.xml b/var/package/Lib_IDNA2-1.9.2.1.xml similarity index 89% rename from var/package/Lib_IDNA2-1.9.2.0.xml rename to var/package/Lib_IDNA2-1.9.2.1.xml index b237e361ec1..d872a05f5bb 100644 --- a/var/package/Lib_IDNA2-1.9.2.0.xml +++ b/var/package/Lib_IDNA2-1.9.2.1.xml @@ -1,17 +1,17 @@ Lib_IDNA2 - 1.9.2.0 + 1.9.2.1 stable GNU Lesser General Public License community Magento Library Magento Library - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - + 2015-07-29 + 5.2.06.0.0 diff --git a/var/package/Lib_Js_Calendar-1.51.1.1.xml b/var/package/Lib_Js_Calendar-1.51.1.2.xml similarity index 95% rename from var/package/Lib_Js_Calendar-1.51.1.1.xml rename to var/package/Lib_Js_Calendar-1.51.1.2.xml index baf28c3deb0..277ed19fbef 100644 --- a/var/package/Lib_Js_Calendar-1.51.1.1.xml +++ b/var/package/Lib_Js_Calendar-1.51.1.2.xml @@ -1,17 +1,17 @@ Lib_Js_Calendar - 1.51.1.1 + 1.51.1.2 stable Mixed community Javascript Calendar for Magento Javascript Calendar for Magento - 1.51.1.1 + 1.51.1.2 Magento Core Teamcorecore@magentocommerce.com - 2012-04-23 - + 2015-07-29 + 5.2.06.0.0 diff --git a/var/package/Lib_Js_Ext-1.7.0.0.xml b/var/package/Lib_Js_Ext-1.9.2.1.xml similarity index 98% rename from var/package/Lib_Js_Ext-1.7.0.0.xml rename to var/package/Lib_Js_Ext-1.9.2.1.xml index 9fd7ba12301..50a2f0c3846 100644 --- a/var/package/Lib_Js_Ext-1.7.0.0.xml +++ b/var/package/Lib_Js_Ext-1.9.2.1.xml @@ -1,18 +1,18 @@ Lib_Js_Ext - 1.7.0.0 + 1.9.2.1 stable Mixed community Extjs Javascript Libraries for Magento Extjs Javascript Libraries for Magento - 1.7.0.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2012-04-23 - - + 2015-07-29 + + 5.2.06.0.0 diff --git a/var/package/Lib_Js_Mage-1.9.2.0.xml b/var/package/Lib_Js_Mage-1.9.2.1.xml similarity index 95% rename from var/package/Lib_Js_Mage-1.9.2.0.xml rename to var/package/Lib_Js_Mage-1.9.2.1.xml index ad391a2b9e1..cf6806af956 100644 --- a/var/package/Lib_Js_Mage-1.9.2.0.xml +++ b/var/package/Lib_Js_Mage-1.9.2.1.xml @@ -1,18 +1,18 @@ Lib_Js_Mage - 1.9.2.0 + 1.9.2.1 stable Mixed community Javascript Libraries for Magento Javascript Libraries for Magento - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - - + 2015-07-29 + + - 5.2.06.0.0Lib_Js_Prototypecommunity1.7.0.11.7.0.1 + 5.2.06.0.0Lib_Js_Prototypecommunity1.9.2.11.9.2.1 diff --git a/var/package/Lib_Js_Prototype-1.7.0.1.xml b/var/package/Lib_Js_Prototype-1.9.2.1.xml similarity index 99% rename from var/package/Lib_Js_Prototype-1.7.0.1.xml rename to var/package/Lib_Js_Prototype-1.9.2.1.xml index 4bed6fdfde0..acc16d9294f 100644 --- a/var/package/Lib_Js_Prototype-1.7.0.1.xml +++ b/var/package/Lib_Js_Prototype-1.9.2.1.xml @@ -1,17 +1,17 @@ Lib_Js_Prototype - 1.7.0.1 + 1.9.2.1 stable Mixed community Prototype and Scriptaculous Javascript Libraries for Magento Prototype and Scriptaculous Javascript Libraries for Magento - 1.7.0.1 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - + 2015-07-29 + 5.2.06.0.0 diff --git a/var/package/Lib_Js_TinyMCE-3.5.11.0.xml b/var/package/Lib_Js_TinyMCE-3.5.11.1.xml similarity index 99% rename from var/package/Lib_Js_TinyMCE-3.5.11.0.xml rename to var/package/Lib_Js_TinyMCE-3.5.11.1.xml index c2cfb477891..2561d495a7e 100644 --- a/var/package/Lib_Js_TinyMCE-3.5.11.0.xml +++ b/var/package/Lib_Js_TinyMCE-3.5.11.1.xml @@ -1,17 +1,17 @@ Lib_Js_TinyMCE - 3.5.11.0 + 3.5.11.1 stable Mixed community TinyMCE Javascript Libraries for Magento TinyMCE Javascript Libraries for Magento - 3.5.11.0 + 3.5.11.1 Magento Core Teamcorecore@magentocommerce.com - 2014-11-05 - + 2015-07-29 + 5.2.06.0.0 diff --git a/var/package/Lib_LinLibertineFont-2.8.14.1.xml b/var/package/Lib_LinLibertineFont-2.8.14.2.xml similarity index 92% rename from var/package/Lib_LinLibertineFont-2.8.14.1.xml rename to var/package/Lib_LinLibertineFont-2.8.14.2.xml index 47cf3cf76ca..729f8d718f1 100644 --- a/var/package/Lib_LinLibertineFont-2.8.14.1.xml +++ b/var/package/Lib_LinLibertineFont-2.8.14.2.xml @@ -1,17 +1,17 @@ Lib_LinLibertineFont - 2.8.14.1 + 2.8.14.2 stable GPL community Libertine Open Fonts Project fonts for PDF print-outs Libertine Open Fonts Project fonts for PDF print-outs - 2.8.14.1 + 2.8.14.2 Magento Core Teamcorecore@magentocommerce.com - 2012-04-23 - + 2015-07-29 + 5.2.06.0.0 diff --git a/var/package/Lib_Mage-1.9.2.0.xml b/var/package/Lib_Mage-1.9.2.1.xml similarity index 98% rename from var/package/Lib_Mage-1.9.2.0.xml rename to var/package/Lib_Mage-1.9.2.1.xml index 2e8c9c903bf..021ea3641d1 100644 --- a/var/package/Lib_Mage-1.9.2.0.xml +++ b/var/package/Lib_Mage-1.9.2.1.xml @@ -1,17 +1,17 @@ Lib_Mage - 1.9.2.0 + 1.9.2.1 stable OSL v3.0 community Mage Library Mage Library - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - + 2015-07-29 + 5.2.06.0.0 diff --git a/var/package/Lib_Magento-1.9.2.0.xml b/var/package/Lib_Magento-1.9.2.1.xml similarity index 94% rename from var/package/Lib_Magento-1.9.2.0.xml rename to var/package/Lib_Magento-1.9.2.1.xml index cd2e05a6eec..15b5b436497 100644 --- a/var/package/Lib_Magento-1.9.2.0.xml +++ b/var/package/Lib_Magento-1.9.2.1.xml @@ -1,17 +1,17 @@ Lib_Magento - 1.9.2.0 + 1.9.2.1 stable OSL v3.0 community Magento Library Magento Library - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - + 2015-07-29 + 5.2.06.0.0 diff --git a/var/package/Lib_Pelago-1.9.1.0.xml b/var/package/Lib_Pelago-1.9.2.1.xml similarity index 86% rename from var/package/Lib_Pelago-1.9.1.0.xml rename to var/package/Lib_Pelago-1.9.2.1.xml index 14f0ea788d0..63ba21b7ff2 100644 --- a/var/package/Lib_Pelago-1.9.1.0.xml +++ b/var/package/Lib_Pelago-1.9.2.1.xml @@ -1,17 +1,17 @@ Lib_Pelago - 1.9.1.0 + 1.9.2.1 stable OSL v3.0 community Pelago Library Pelago Library - 1.9.1.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2014-11-05 - + 2015-07-29 + 5.2.06.0.0 diff --git a/var/package/Lib_Phpseclib-1.5.0.0.xml b/var/package/Lib_Phpseclib-1.9.2.1.xml similarity index 94% rename from var/package/Lib_Phpseclib-1.5.0.0.xml rename to var/package/Lib_Phpseclib-1.9.2.1.xml index 61d4a388d2d..7dcdaa9e162 100644 --- a/var/package/Lib_Phpseclib-1.5.0.0.xml +++ b/var/package/Lib_Phpseclib-1.9.2.1.xml @@ -1,17 +1,17 @@ Lib_Phpseclib - 1.5.0.0 + 1.9.2.1 stable LGPL v.3 community Phpseclib Library Phpseclib Library - 1.5.0.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2011-07-11 - + 2015-07-29 + 5.2.06.0.0 diff --git a/var/package/Lib_Varien-1.9.2.0.xml b/var/package/Lib_Varien-1.9.2.1.xml similarity index 92% rename from var/package/Lib_Varien-1.9.2.0.xml rename to var/package/Lib_Varien-1.9.2.1.xml index 15d7981c7fa..0201d21c98f 100644 --- a/var/package/Lib_Varien-1.9.2.0.xml +++ b/var/package/Lib_Varien-1.9.2.1.xml @@ -1,18 +1,18 @@ Lib_Varien - 1.9.2.0 + 1.9.2.1 stable OSL v3.0 community Varien Library Varien Library - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - + 2015-07-29 + - 5.2.06.0.0Lib_ZFcommunity1.12.10.01.12.10.0PDOSPLcurlSimpleXMLdomgdiconvpdo_mysqlmcryptpcreReflectionsession + 5.2.06.0.0Lib_ZFcommunity1.12.10.11.12.10.1PDOSPLcurlSimpleXMLdomgdiconvpdo_mysqlmcryptpcreReflectionsession diff --git a/var/package/Lib_ZF-1.12.10.0.xml b/var/package/Lib_ZF-1.12.10.1.xml similarity index 99% rename from var/package/Lib_ZF-1.12.10.0.xml rename to var/package/Lib_ZF-1.12.10.1.xml index 87f767a8593..f705edb09bb 100644 --- a/var/package/Lib_ZF-1.12.10.0.xml +++ b/var/package/Lib_ZF-1.12.10.1.xml @@ -1,18 +1,18 @@ Lib_ZF - 1.12.10.0 + 1.12.10.1 stable New BSD community Zend Framework Zend Framework - 1.12.10.0 + 1.12.10.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - + 2015-07-29 + - 5.2.06.0.0Lib_ZF_Localecommunity1.12.10.01.12.10.0 + 5.2.06.0.0Lib_ZF_Localecommunity1.12.10.11.12.10.1 diff --git a/var/package/Lib_ZF_Locale-1.12.10.0.xml b/var/package/Lib_ZF_Locale-1.12.10.1.xml similarity index 99% rename from var/package/Lib_ZF_Locale-1.12.10.0.xml rename to var/package/Lib_ZF_Locale-1.12.10.1.xml index 5e6f062fd1d..dcf014b1cd5 100644 --- a/var/package/Lib_ZF_Locale-1.12.10.0.xml +++ b/var/package/Lib_ZF_Locale-1.12.10.1.xml @@ -1,7 +1,7 @@ Lib_ZF_Locale - 1.12.10.0 + 1.12.10.1 stable New BSD community @@ -9,10 +9,10 @@ Zend Framework Locale Zend Framework Locale splitted from ZF to avoid memory overruns during installation and upgrades - 1.12.10.0 + 1.12.10.1 Magento Enterprise Teamcorecore@magentocommerce.com - 2015-06-25 - + 2015-07-29 + 5.2.06.0.0 diff --git a/var/package/Mage_All_Latest-1.9.2.0.xml b/var/package/Mage_All_Latest-1.9.2.0.xml deleted file mode 100644 index 14ba9959f9a..00000000000 --- a/var/package/Mage_All_Latest-1.9.2.0.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - Mage_All_Latest - 1.9.2.0 - stable - OSL v3.0 - community - - Metapackage for latest Magento 1.9.0.0 release - Metapackage for latest Magento 1.9.0.0 release - 1.9.2.0 - Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - - - - 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.01.9.2.0Mage_Core_Adminhtmlcommunity1.9.2.01.9.2.0Interface_Adminhtml_Defaultcommunity1.9.2.01.9.2.0Interface_Frontend_Defaultcommunity1.9.2.01.9.2.0Interface_Install_Defaultcommunity1.9.2.01.9.2.0Mage_Downloadercommunity1.9.2.01.9.2.0Mage_Centinelcommunity1.9.2.01.9.2.0Interface_Frontend_Base_Defaultcommunity1.9.2.01.9.2.0Phoenix_Moneybookerscommunity1.9.2.01.9.2.0Mage_Compilercommunity1.9.2.01.9.2.0Magento_Mobilecommunity1.9.2.01.9.2.0Lib_Cmcommunity1.9.2.01.9.2.0Cm_RedisSessioncommunity1.9.2.01.9.2.0Interface_Frontend_Rwd_Defaultcommunity1.9.2.01.9.2.0 - diff --git a/var/package/Mage_All_Latest-1.9.2.1.xml b/var/package/Mage_All_Latest-1.9.2.1.xml new file mode 100644 index 00000000000..cf713f7c53b --- /dev/null +++ b/var/package/Mage_All_Latest-1.9.2.1.xml @@ -0,0 +1,18 @@ + + + Mage_All_Latest + 1.9.2.1 + stable + OSL v3.0 + community + + Metapackage for latest Magento 1.9.0.0 release + Metapackage for latest Magento 1.9.0.0 release + 1.9.2.1 + Magento Core Teamcorecore@magentocommerce.com + 2015-07-29 + + + + 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.11.9.2.1Mage_Core_Adminhtmlcommunity1.9.2.11.9.2.1Interface_Adminhtml_Defaultcommunity1.9.2.11.9.2.1Interface_Frontend_Defaultcommunity1.9.2.11.9.2.1Interface_Install_Defaultcommunity1.9.2.11.9.2.1Mage_Downloadercommunity1.9.2.11.9.2.1Mage_Centinelcommunity1.9.2.11.9.2.1Interface_Frontend_Base_Defaultcommunity1.9.2.11.9.2.1Phoenix_Moneybookerscommunity1.9.2.11.9.2.1Mage_Compilercommunity1.9.2.11.9.2.1Magento_Mobilecommunity1.9.2.11.9.2.1Lib_Cmcommunity1.9.2.11.9.2.1Cm_RedisSessioncommunity1.9.2.11.9.2.1Interface_Frontend_Rwd_Defaultcommunity1.9.2.11.9.2.1 + diff --git a/var/package/Mage_Centinel-1.9.2.0.xml b/var/package/Mage_Centinel-1.9.2.1.xml similarity index 96% rename from var/package/Mage_Centinel-1.9.2.0.xml rename to var/package/Mage_Centinel-1.9.2.1.xml index 335fc9f5fd7..a737855da7f 100644 --- a/var/package/Mage_Centinel-1.9.2.0.xml +++ b/var/package/Mage_Centinel-1.9.2.1.xml @@ -1,18 +1,18 @@ Mage_Centinel - 1.9.2.0 + 1.9.2.1 stable mixed community 3D Secure Card Validation An integration with Cardinalcommerce Centinel service. Provides option to validate Visa and Mastercard cards for eliminating possible fraudlent order placement attempts. Adds information about Electronic Commerce Identifier, that designates liability for chargeback. - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - + 2015-07-29 + - 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.01.9.2.0 + 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.11.9.2.1 diff --git a/var/package/Mage_Compiler-1.9.2.0.xml b/var/package/Mage_Compiler-1.9.2.1.xml similarity index 91% rename from var/package/Mage_Compiler-1.9.2.0.xml rename to var/package/Mage_Compiler-1.9.2.1.xml index 42b47b900a1..2d8c122ebe4 100644 --- a/var/package/Mage_Compiler-1.9.2.0.xml +++ b/var/package/Mage_Compiler-1.9.2.1.xml @@ -1,18 +1,18 @@ Mage_Compiler - 1.9.2.0 + 1.9.2.1 stable OSL v3.0 community This module compiles all files of a Magento installation and creates a single include path to increase performance This module compiles all files of a Magento installation and creates a single include path to increase performance - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - + 2015-07-29 + - 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.01.9.2.0Mage_Core_Adminhtmlcommunity1.9.2.01.9.2.0 + 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.11.9.2.1Mage_Core_Adminhtmlcommunity1.9.2.11.9.2.1 diff --git a/var/package/Mage_Core_Adminhtml-1.9.2.0.xml b/var/package/Mage_Core_Adminhtml-1.9.2.1.xml similarity index 99% rename from var/package/Mage_Core_Adminhtml-1.9.2.0.xml rename to var/package/Mage_Core_Adminhtml-1.9.2.1.xml index ad0eabe66c2..1dff21370dd 100644 --- a/var/package/Mage_Core_Adminhtml-1.9.2.0.xml +++ b/var/package/Mage_Core_Adminhtml-1.9.2.1.xml @@ -1,18 +1,18 @@ Mage_Core_Adminhtml - 1.9.2.0 + 1.9.2.1 stable OSL v3.0 community Magento Administration Panel Magento Administration Panel - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - - + 2015-07-29 + + - 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.01.9.2.0Lib_Js_Calendarcommunity1.51.1.11.51.1.1Lib_Js_Extcommunity1.7.0.01.7.0.0Lib_LinLibertineFontcommunity2.8.14.12.8.14.1Lib_Js_TinyMCEcommunity3.5.11.03.5.11.0 + 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.11.9.2.1Lib_Js_Calendarcommunity1.51.1.21.51.1.2Lib_Js_Extcommunity1.9.2.11.9.2.1Lib_LinLibertineFontcommunity2.8.14.22.8.14.2Lib_Js_TinyMCEcommunity3.5.11.13.5.11.1 diff --git a/var/package/Mage_Core_Modules-1.9.2.0.xml b/var/package/Mage_Core_Modules-1.9.2.1.xml similarity index 99% rename from var/package/Mage_Core_Modules-1.9.2.0.xml rename to var/package/Mage_Core_Modules-1.9.2.1.xml index ae30947a0c9..4bef04851b4 100644 --- a/var/package/Mage_Core_Modules-1.9.2.0.xml +++ b/var/package/Mage_Core_Modules-1.9.2.1.xml @@ -1,18 +1,18 @@ Mage_Core_Modules - 1.9.2.0 + 1.9.2.1 stable OSL v3.0 community Collection of Magento Core Modules Collection of Magento Core Modules - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - - + 2015-07-29 + + - 5.2.06.0.0Lib_Variencommunity1.9.2.01.9.2.0Lib_Google_Checkoutcommunity1.9.2.01.9.2.0Lib_Js_Calendarcommunity1.51.1.11.51.1.1Lib_Js_Magecommunity1.9.2.01.9.2.0Lib_Js_Prototypecommunity1.7.0.11.7.0.1Lib_Phpseclibcommunity1.5.0.01.5.0.0Mage_Locale_en_UScommunity1.9.2.01.9.2.0Lib_Magecommunity1.9.2.01.9.2.0Lib_Magentocommunity1.9.2.01.9.2.0Lib_Crediscommunity1.9.2.01.9.2.0Lib_Pelagocommunity1.9.1.01.9.1.0Lib_IDNA2community1.9.2.01.9.2.0 + 5.2.06.0.0Lib_Variencommunity1.9.2.11.9.2.1Lib_Google_Checkoutcommunity1.9.2.11.9.2.1Lib_Js_Calendarcommunity1.51.1.21.51.1.2Lib_Js_Magecommunity1.9.2.11.9.2.1Lib_Js_Prototypecommunity1.9.2.11.9.2.1Lib_Phpseclibcommunity1.9.2.11.9.2.1Mage_Locale_en_UScommunity1.9.2.11.9.2.1Lib_Magecommunity1.9.2.11.9.2.1Lib_Magentocommunity1.9.2.11.9.2.1Lib_Crediscommunity1.9.2.11.9.2.1Lib_Pelagocommunity1.9.2.11.9.2.1Lib_IDNA2community1.9.2.11.9.2.1 diff --git a/var/package/Mage_Downloader-1.9.2.0.xml b/var/package/Mage_Downloader-1.9.2.1.xml similarity index 97% rename from var/package/Mage_Downloader-1.9.2.0.xml rename to var/package/Mage_Downloader-1.9.2.1.xml index aff9d904e1c..7c985b35965 100644 --- a/var/package/Mage_Downloader-1.9.2.0.xml +++ b/var/package/Mage_Downloader-1.9.2.1.xml @@ -1,18 +1,18 @@ Mage_Downloader - 1.9.2.0 + 1.9.2.1 stable OSL v3.0 community Magento Downloader Magento Downloader - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - - + 2015-07-29 + + 5.2.06.0.0 diff --git a/var/package/Mage_Locale_en_US-1.9.2.0.xml b/var/package/Mage_Locale_en_US-1.9.2.1.xml similarity index 77% rename from var/package/Mage_Locale_en_US-1.9.2.0.xml rename to var/package/Mage_Locale_en_US-1.9.2.1.xml index cc3e11c617b..a2613ca389c 100644 --- a/var/package/Mage_Locale_en_US-1.9.2.0.xml +++ b/var/package/Mage_Locale_en_US-1.9.2.1.xml @@ -1,18 +1,18 @@ Mage_Locale_en_US - 1.9.2.0 + 1.9.2.1 stable AFL v3.0 community en_US locale en_US locale - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - - + 2015-07-29 + + 5.2.06.0.0 diff --git a/var/package/Magento_Mobile-1.9.2.0.xml b/var/package/Magento_Mobile-1.9.2.1.xml similarity index 98% rename from var/package/Magento_Mobile-1.9.2.0.xml rename to var/package/Magento_Mobile-1.9.2.1.xml index ccdac3ef037..cb6c7b4fc53 100644 --- a/var/package/Magento_Mobile-1.9.2.0.xml +++ b/var/package/Magento_Mobile-1.9.2.1.xml @@ -1,18 +1,18 @@ Magento_Mobile - 1.9.2.0 + 1.9.2.1 stable mixed community Magento Mobile Xml Interface An integration Magento with mobile applications (e.g. iPhone, Android, iPad) - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - - + 2015-07-29 + + - 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.01.9.2.0 + 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.11.9.2.1 diff --git a/var/package/Phoenix_Moneybookers-1.9.2.0.xml b/var/package/Phoenix_Moneybookers-1.9.2.1.xml similarity index 92% rename from var/package/Phoenix_Moneybookers-1.9.2.0.xml rename to var/package/Phoenix_Moneybookers-1.9.2.1.xml index 2a5ec56641e..fb818d48835 100644 --- a/var/package/Phoenix_Moneybookers-1.9.2.0.xml +++ b/var/package/Phoenix_Moneybookers-1.9.2.1.xml @@ -1,7 +1,7 @@ Phoenix_Moneybookers - 1.9.2.0 + 1.9.2.1 stable mixed community @@ -25,11 +25,11 @@ Przelewy24 - Poland Sofortüberweisung - Germany Nordea Solo - Finland Moneybookers eWallet - 1.9.2.0 + 1.9.2.1 Magento Core Teamcorecore@magentocommerce.com - 2015-06-25 - - + 2015-07-29 + + - 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.01.9.2.0 + 5.2.06.0.0Mage_Core_Modulescommunity1.9.2.11.9.2.1