Skip to content

Commit 1617a6e

Browse files
magento-teammagento-team
committed
Update as of 7/19/2012
* Implemented inheritance of locales. Inheritance is declared in `app/locale/<locale_name>/config.xml` * Moved declaration of modules from `app/etc/modules/<module>.xml` to `app/code/<pool>/<namespace>/<module>/config.xml` * Implemented ability to match URLs in format `protocol://base_url/area/module/controller/action` (as opposite to only `module/controller/action`), utilized this feature in backend (admin) area * Added product attribute set "Minimal Attributes", which consists of required system attributes only * Improved customers import: * Implemented "Delete" behavior for importing customers, customer addresses and financial data * Implemented "Custom" behavior, which allows to specify behavior for each item directly from the imported file * Updated performance tests: * Enabled Product View, Category View, Add to Cart, Quick Search and Advanced Search scenarios * Added ability to specify configuration parameters per scenario and refactored bootstrap of performance tests * Implemented `mage.js` for base JavaScript initialization of the application * Implemented new JS translation mechanism. JavaScript translations are loaded by locale code stored in cookies * Implemented unit tests for JavaScript widgets in Visual Design Editor * Added jQuery plugins: Cookie, Metadata, Validation, Head JS * Fixed issues: * Impossible to add configurable product to the cart * Impossible to apply Shopping Cart Price Rule with any conditions to cart with simple and virtual product * Memory leak in email templates * Impossible to place order with Multiple Addresses using 3D Secure * Required product attributes are not exported * "Forgot Your Password" link on checkout page inactive after captcha reloading * Validation of "Number of Symbols" field in Captcha configuration doesn't work * Other small fixes * GitHub requests: * [#37](#37) -- fixed particular case of "HEADERS ALREADY SENT" error in WYSIWYG thumbnail * [#39](#39) -- added `composer.json` * [#40](#40) -- fixed generation of "secret key" in backend URLs to honor `_forward` in controllers
1 parent 3330e25 commit 1617a6e

File tree

322 files changed

+20833
-3196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

322 files changed

+20833
-3196
lines changed

‎CHANGELOG.markdown

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
Update as of 7/19/2012
2+
=====================
3+
* Implemented inheritance of locales. Inheritance is declared in `app/locale/<locale_name>/config.xml`
4+
* Moved declaration of modules from `app/etc/modules/<module>.xml` to `app/code/<pool>/<namespace>/<module>/config.xml`
5+
* Implemented ability to match URLs in format `protocol://base_url/area/module/controller/action` (as opposite to only `module/controller/action`), utilized this feature in backend (admin) area
6+
* Added product attribute set "Minimal Attributes", which consists of required system attributes only
7+
* Improved customers import:
8+
* Implemented "Delete" behavior for importing customers, customer addresses and financial data
9+
* Implemented "Custom" behavior, which allows to specify behavior for each item directly from the imported file
10+
* Updated performance tests:
11+
* Enabled Product View, Category View, Add to Cart, Quick Search and Advanced Search scenarios
12+
* Added ability to specify configuration parameters per scenario and refactored bootstrap of performance tests
13+
* Implemented `mage.js` for base JavaScript initialization of the application
14+
* Implemented new JS translation mechanism. JavaScript translations are loaded by locale code stored in cookies
15+
* Implemented unit tests for JavaScript widgets in Visual Design Editor
16+
* Added jQuery plugins: Cookie, Metadata, Validation, Head JS
17+
* Fixed issues:
18+
* Impossible to add configurable product to the cart
19+
* Impossible to apply Shopping Cart Price Rule with any conditions to cart with simple and virtual product
20+
* Memory leak in email templates
21+
* Impossible to place order with Multiple Addresses using 3D Secure
22+
* Required product attributes are not exported
23+
* "Forgot Your Password" link on checkout page inactive after captcha reloading
24+
* Validation of "Number of Symbols" field in Captcha configuration doesn't work
25+
* Other small fixes
26+
* GitHub requests:
27+
* [#37](https://github.com/magento/magento2/pull/37) -- fixed particular case of "HEADERS ALREADY SENT" error in WYSIWYG thumbnail
28+
* [#39](https://github.com/magento/magento2/pull/39) -- added `composer.json`
29+
* [#40](https://github.com/magento/magento2/pull/40) -- fixed generation of "secret key" in backend URLs to honor `_forward` in controllers
30+
131
Update as of 7/3/2012
232
=====================
333
* Refactored backend (admin) menu generation:

‎app/code/community/Phoenix/Moneybookers/etc/config.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
<modules>
3030
<Phoenix_Moneybookers>
3131
<version>1.6.0.0</version>
32+
<active>true</active>
33+
<codePool>community</codePool>
3234
</Phoenix_Moneybookers>
3335
</modules>
3436
<global>

‎app/code/core/Mage/Admin/etc/config.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
<modules>
3030
<Mage_Admin>
3131
<version>1.6.1.0</version>
32+
<active>true</active>
33+
<codePool>core</codePool>
34+
<depends>
35+
<Mage_Core/>
36+
</depends>
3237
</Mage_Admin>
3338
</modules>
3439
</config>

‎app/code/core/Mage/AdminNotification/etc/config.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
<modules>
3030
<Mage_AdminNotification>
3131
<version>1.6.0.0</version>
32+
<active>true</active>
33+
<codePool>core</codePool>
34+
<depends>
35+
<Mage_Core/>
36+
<Mage_Adminhtml/>
37+
</depends>
3238
</Mage_AdminNotification>
3339
</modules>
3440
<global>

‎app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custompath.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class Mage_Adminhtml_Model_System_Config_Backend_Admin_Custompath extends Mage_C
4242
protected function _beforeSave()
4343
{
4444
if ($this->getOldValue() != $this->getValue()) {
45+
Mage::helper('Mage_Backend_Helper_Data')->clearAreaFrontName();
4546
Mage::register('custom_admin_path_redirect', true, true);
4647
}
4748
return $this;

‎app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Observer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ public function afterCustomUrlChanged($observer)
4242
$adminSession->unsetAll();
4343
$adminSession->getCookie()->delete($adminSession->getSessionName());
4444

45-
$route = ((bool)(string)Mage::getConfig()->getNode(Mage_Adminhtml_Helper_Data::XML_PATH_USE_CUSTOM_ADMIN_PATH))
46-
? Mage::getConfig()->getNode(Mage_Adminhtml_Helper_Data::XML_PATH_CUSTOM_ADMIN_PATH)
47-
: Mage::getConfig()->getNode(Mage_Adminhtml_Helper_Data::XML_PATH_ADMINHTML_ROUTER_FRONTNAME);
45+
$route = Mage::helper('Mage_Backend_Helper_Data')->getAreaFrontName();
4846

4947
Mage::app()->getResponse()
5048
->setRedirect(Mage::getBaseUrl() . $route)

‎app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustompath.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class Mage_Adminhtml_Model_System_Config_Backend_Admin_Usecustompath extends Mag
4242
protected function _beforeSave()
4343
{
4444
if ($this->getOldValue() != $this->getValue()) {
45+
Mage::helper('Mage_Backend_Helper_Data')->clearAreaFrontName();
4546
Mage::register('custom_admin_path_redirect', true, true);
4647
}
4748

‎app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public function thumbnailAction()
189189
$adapter = Mage::helper('Mage_Core_Helper_Data')->getImageAdapterType();
190190
$image = Varien_Image_Adapter::factory($adapter);
191191
$image->open($thumb);
192-
$image->display();
192+
$this->getResponse()->setHeader('Content-Type', $image->getMimeType())->setBody($image->getImage());
193193
} else {
194194
// todo: genearte some placeholder
195195
}

‎app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,15 @@ public function directiveAction()
4444
$directive = Mage::helper('Mage_Core_Helper_Data')->urlDecode($directive);
4545
$url = Mage::getModel('Mage_Core_Model_Email_Template_Filter')->filter($directive);
4646
$adapter = Mage::helper('Mage_Core_Helper_Data')->getImageAdapterType();
47+
$image = Varien_Image_Adapter::factory($adapter);
48+
$response = $this->getResponse();
4749
try {
48-
$image = Varien_Image_Adapter::factory($adapter);
4950
$image->open($url);
50-
$image->display();
51+
$response->setHeader('Content-Type', $image->getMimeType())->setBody($image->getImage());
5152
} catch (Exception $e) {
52-
$image = Varien_Image_Adapter::factory($adapter);
5353
$image->open(Mage::getSingleton('Mage_Cms_Model_Wysiwyg_Config')->getSkinImagePlaceholderUrl());
54-
$image->display();
55-
/*
56-
$image = imagecreate(100, 100);
57-
$bkgrColor = imagecolorallocate($image,10,10,10);
58-
imagefill($image,0,0,$bkgrColor);
59-
$textColor = imagecolorallocate($image,255,255,255);
60-
imagestring($image, 4, 10, 10, 'Skin image', $textColor);
61-
header('Content-type: image/png');
62-
imagepng($image);
63-
imagedestroy($image);
64-
*/
54+
$response->setHeader('Content-Type', $image->getMimeType())->setBody($image->getImage());
55+
Mage::logException($e);
6556
}
6657
}
6758
}

‎app/code/core/Mage/Adminhtml/etc/config.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
<modules>
3030
<Mage_Adminhtml>
3131
<version>0.7.1</version>
32+
<active>true</active>
33+
<codePool>core</codePool>
34+
<depends>
35+
<Mage_Admin/>
36+
</depends>
3237
</Mage_Adminhtml>
3338
</modules>
3439
<global>

0 commit comments

Comments
 (0)