This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/code/core/Mage/Admin/Model/Observer.php b/app/code/core/Mage/Admin/Model/Observer.php | |
index 456c1d3d..2825b42a 100644 | |
--- a/app/code/core/Mage/Admin/Model/Observer.php | |
+++ b/app/code/core/Mage/Admin/Model/Observer.php | |
@@ -123,4 +123,34 @@ class Mage_Admin_Model_Observer | |
public function actionPostDispatchAdmin($event) | |
{ | |
} | |
+ | |
+ /** |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php | |
index ff633cee..5dab2f1e 100644 | |
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php | |
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php | |
@@ -55,7 +55,10 @@ class Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Gallery_Content extends M | |
$this->getUploader()->getUploaderConfig() | |
->setFileParameterName('image') | |
- ->setTarget(Mage::getModel('adminhtml/url')->addSessionParam()->getUrl('*/catalog_product_gallery/upload')); | |
+ ->setTarget(Mage::getModel('adminhtml/url')->addSessionParam()->getUrl( |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/Mage.php b/app/Mage.php | |
index 89b63ed6..327e9286 100644 | |
--- a/app/Mage.php | |
+++ b/app/Mage.php | |
@@ -816,9 +816,9 @@ final class Mage | |
',', | |
(string) self::getConfig()->getNode('dev/log/allowedFileExtensions', Mage_Core_Model_Store::DEFAULT_CODE) | |
); | |
- $logValidator = new Zend_Validate_File_Extension($_allowedFileExtensions); | |
$logDir = self::getBaseDir('var') . DS . 'log'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php | |
index c44c3efc..76471f0c 100644 | |
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php | |
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php | |
@@ -49,6 +49,18 @@ class Mage_Adminhtml_Block_Customer_Group_Edit extends Mage_Adminhtml_Block_Widg | |
} | |
} | |
+ public function getDeleteUrl() | |
+ { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/code/core/Mage/Admin/Model/Session.php b/app/code/core/Mage/Admin/Model/Session.php | |
index bc9dee0..d2dfa2a 100644 | |
--- a/app/code/core/Mage/Admin/Model/Session.php | |
+++ b/app/code/core/Mage/Admin/Model/Session.php | |
@@ -138,6 +138,9 @@ class Mage_Admin_Model_Session extends Mage_Core_Model_Session_Abstract | |
Mage::throwException(Mage::helper('adminhtml')->__('Invalid User Name or Password.')); | |
} | |
} catch (Mage_Core_Exception $e) { | |
+ $e->setMessage( | |
+ Mage::helper('adminhtml')->__('You did not sign in correctly or your account is temporarily disabled.') |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
En la rama development | |
Cambios no preparados para el commit: | |
(use «git add <archivo>...» para actualizar lo que se confirmará) | |
(use «git checkout -- <archivo>...» para descartar cambios en el directorio de trabajo) | |
modificado: .htaccess | |
modificado: .htaccess.sample | |
modificado: RELEASE_NOTES.txt | |
modificado: api.php | |
modificado: app/Mage.php |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- Magento-CE-2.0.6/CHANGELOG.md 2016-05-16 13:49:30.000000000 -0300 | |
+++ Magento-CE-2.0.7/CHANGELOG.md 2016-05-20 18:25:36.000000000 -0300 | |
@@ -1,3 +1,8 @@ | |
+2.0.7 | |
+============= | |
+* GitHub requests: | |
+ * [#2984](https://github.com/magento/magento2/issues/2984) -- Payment config settings not decrypted when used? | |
+ | |
2.0.6 | |
============= |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- Magento-CE-2.0.5/app/bootstrap.php 2016-04-27 23:23:14.000000000 -0300 | |
+++ Magento-CE-2.0.6/app/bootstrap.php 2016-05-16 13:49:31.000000000 -0300 | |
@@ -9,7 +9,6 @@ | |
*/ | |
error_reporting(E_ALL); | |
#ini_set('display_errors', 1); | |
-umask(0); | |
/* PHP version validation */ | |
if (version_compare(phpversion(), '5.5.0', '<') === true) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/Magento-CE-2.0.4/.gitignore | |
/Magento-CE-2.0.4/README.md |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/Magento-CE-2.0.5/vendor/magento/module-customer/Model/Address/CustomAttributeList.php | |
<?php | |
/** | |
* Copyright © 2016 Magento. All rights reserved. | |
* See COPYING.txt for license details. | |
*/ | |
namespace Magento\Customer\Model\Address; | |
class CustomAttributeList implements CustomAttributeListInterface | |
{ |
NewerOlder