Skip to content

Commit

Permalink
2.0.0.0-dev54
Browse files Browse the repository at this point in the history
* Modularity improvements:
  * Breakdown of the Adminhtml module:
     * Moved Newsletter, Report logic to the respective modules
     * Moved blocks, config, view, layout files of other components from Adminhtml folder to respective modules
  * Removed application dependencies from the library
* Move Magento\Core common blocks in the library
* Application areas rework:
  * Areas are independent from Store
  * Removed deprecated annotation from the getArea methods
* GitHub requests:
  * [#245](#245) -- Resolve design flaws in core URL helper
  * [#247](#247) -- Bug in Mage_Page_Block_Html_Header->getIsHomePage
  * [#259](#259) -- Turkish Lira (TRY) is supported for Turkish members.
  * [#262](#262) -- Update Rule.php
  * [#373](#373) -- [Magento/Sales] Fixed typos
  * [#382](#382) -- [Magento/Core] Fixed typos
  * [#304](#304) -- Removed Erroneous closing "
  * [#323](#323) -- InstanceController.php - made setBody protected
  * [#349](#349) -- Move Mage_Catalog menu declaration into Mage_Catalog module.
  * [#265](#265) -- Update Merge.php
  * [#271](#271) -- Check Data should validate gallery information
  * [#305](#305) -- Extra ", tidied up nested quotes
  * [#352](#352) -- Add Croatia Country as part of European Union since 1st July 2013 for default european local countries in configuration
  * [#224](#224) -- Tax formatting is locale aware and should not
  * [#338](#338) -- Correcting SQL for required_options column
  * [#327](#327) -- cart api bug fix & partial invoice credit memo divide by zero warning
* Themes update:
  * Old frontend (magento_demo) and backend (magento_basic) themes are removed
  * Updated templates and layout updates in the Bundle, Catalog, CatalogInventory, CatalogSearch, Downloadable, ProductAlert, Reports, Sendfriend modules
* Fixed bugs:
  * Fixed the error when  Magento cannot be reinstalled to the same database with table prefix
  * Fixed report Products in Cart
  * Fixed error on attempt to insert image to CMS pages under version control
  * Fixed order status grid so that you can assign state, edit, and view custom order status
  * Fixed Related Products Rule page so that category can be selected on conditions tab
  * Fixed Magento_Paypal_Controller_ExpressTest integration test so it is re-enabled
  * Fixed the bug with international DHL quotes
  • Loading branch information
magento-team committed Nov 29, 2013
1 parent b3d6949 commit 6e24c0b
Show file tree
Hide file tree
Showing 2,143 changed files with 27,516 additions and 61,959 deletions.
47 changes: 43 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,43 @@
2.0.0.0-dev54
=============
* Modularity improvements:
* Breakdown of the Adminhtml module:
* Moved Newsletter, Report logic to the respective modules
* Moved blocks, config, view, layout files of other components from Adminhtml folder to respective modules
* Removed application dependencies from the library
* Move Magento\Core common blocks in the library
* Application areas rework:
* Areas are independent from Store
* Removed deprecated annotation from the getArea methods
* GitHub requests:
* [#245](https://github.com/magento/magento2/pull/245) -- Resolve design flaws in core URL helper
* [#247](https://github.com/magento/magento2/pull/247) -- Bug in Mage_Page_Block_Html_Header->getIsHomePage
* [#259](https://github.com/magento/magento2/pull/259) -- Turkish Lira (TRY) is supported for Turkish members.
* [#262](https://github.com/magento/magento2/pull/262) -- Update Rule.php
* [#373](https://github.com/magento/magento2/pull/373) -- [Magento/Sales] Fixed typos
* [#382](https://github.com/magento/magento2/pull/382) -- [Magento/Core] Fixed typos
* [#304](https://github.com/magento/magento2/pull/304) -- Removed Erroneous closing "
* [#323](https://github.com/magento/magento2/pull/323) -- InstanceController.php - made setBody protected
* [#349](https://github.com/magento/magento2/pull/349) -- Move Mage_Catalog menu declaration into Mage_Catalog module.
* [#265](https://github.com/magento/magento2/pull/265) -- Update Merge.php
* [#271](https://github.com/magento/magento2/pull/271) -- Check Data should validate gallery information
* [#305](https://github.com/magento/magento2/pull/305) -- Extra ", tidied up nested quotes
* [#352](https://github.com/magento/magento2/pull/352) -- Add Croatia Country as part of European Union since 1st July 2013 for default european local countries in configuration
* [#224](https://github.com/magento/magento2/pull/224) -- Tax formatting is locale aware and should not
* [#338](https://github.com/magento/magento2/pull/338) -- Correcting SQL for required_options column
* [#327](https://github.com/magento/magento2/pull/327) -- cart api bug fix & partial invoice credit memo divide by zero warning
* Themes update:
* Old frontend (magento_demo) and backend (magento_basic) themes are removed
* Updated templates and layout updates in the Bundle, Catalog, CatalogInventory, CatalogSearch, Downloadable, ProductAlert, Reports, Sendfriend modules
* Fixed bugs:
* Fixed the error when Magento cannot be reinstalled to the same database with table prefix
* Fixed report Products in Cart
* Fixed error on attempt to insert image to CMS pages under version control
* Fixed order status grid so that you can assign state, edit, and view custom order status
* Fixed Related Products Rule page so that category can be selected on conditions tab
* Fixed Magento_Paypal_Controller_ExpressTest integration test so it is re-enabled
* Fixed the bug with international DHL quotes

2.0.0.0-dev53
=============
* Moved general action-related functionality to \Magento\App\Action\Action in the library. Removed Magento\Core\Controller\Varien\Action and related logic from the Magento_Core module
Expand All @@ -10,9 +50,9 @@
* GitHub requests:
* [#238](https://github.com/magento/magento2/pull/238) -- Improve escaping HTML entities in URL
* [#199](https://github.com/magento/magento2/pull/199) -- Replaced function calls to array_push with adding the elements directly
* [#182](https://github.com/magento/magento2/pull/182) -- By default use collection _idFieldName for toOption* methods.
* [#182](https://github.com/magento/magento2/pull/182) -- By default use collection _idFieldName for toOption* methods
* [#233](https://github.com/magento/magento2/pull/233) -- Google Rich Snippet Code
* [#339](https://github.com/magento/magento2/pull/339) -- Correcting 'cahce' typo in documentation.
* [#339](https://github.com/magento/magento2/pull/339) -- Correcting 'cahce' typo in documentation
* [#232](https://github.com/magento/magento2/pull/232) -- Update app/code/core/Mage/Checkout/controllers/CartController.php (fix issue #27632)
* Fixed bugs:
* Fixed JavaScript error when printing orders from the frontend
Expand All @@ -29,11 +69,10 @@
* Moved Magento\Core\Model\Theme to the Magento\View component
* Moved Magento\Core\Model\Design to the Magento\View component
* Consistent declaration of page-types
* The Framework part of the Cache functionality moved out from modules
* Themes update:
* Updated templates and layout updates in the Captcha, Customer, Newsletter, Persistent, ProductAlert, Wishlist modules; old files moved to the "magento-backup" theme
* Refactored and removed duplicate Persistent module templates
* Plushe theme made responsive
* Plushe theme is responsive now
* Fixed bugs:
* Fixed inability to print order, invoice, or creditmemo in the frontend
* Fixed fatal error caused by the Mage_Backend_Block_System_Config_FormTest integration test
Expand Down
16 changes: 8 additions & 8 deletions app/code/Magento/AdminNotification/Model/Feed.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ class Feed extends \Magento\Core\Model\AbstractModel
protected $_feedUrl;

/**
* @var \Magento\Core\Model\Store\Config
* @var \Magento\Backend\App\ConfigInterface
*/
protected $_coreStoreConfig;
protected $_backendConfig;

/**
* @var \Magento\AdminNotification\Model\InboxFactory
Expand All @@ -61,7 +61,7 @@ class Feed extends \Magento\Core\Model\AbstractModel
/**
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\Backend\App\ConfigInterface $backendConfig
* @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
Expand All @@ -70,14 +70,14 @@ class Feed extends \Magento\Core\Model\AbstractModel
public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\Backend\App\ConfigInterface $backendConfig,
\Magento\AdminNotification\Model\InboxFactory $inboxFactory,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
array $data = array()
) {
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
$this->_coreStoreConfig = $coreStoreConfig;
$this->_backendConfig = $backendConfig;
$this->_inboxFactory = $inboxFactory;
}

Expand All @@ -97,9 +97,9 @@ protected function _construct()
*/
public function getFeedUrl()
{
$httpPath = $this->_coreStoreConfig->getConfigFlag(self::XML_USE_HTTPS_PATH) ? 'https://' : 'http://';
$httpPath = $this->_backendConfig->getFlag(self::XML_USE_HTTPS_PATH) ? 'https://' : 'http://';
if (is_null($this->_feedUrl)) {
$this->_feedUrl = $httpPath . $this->_coreStoreConfig->getConfig(self::XML_FEED_URL_PATH);
$this->_feedUrl = $httpPath . $this->_backendConfig->getValue(self::XML_FEED_URL_PATH);
}
return $this->_feedUrl;
}
Expand Down Expand Up @@ -158,7 +158,7 @@ public function getDate($rssDate)
*/
public function getFrequency()
{
return $this->_coreStoreConfig->getConfig(self::XML_FREQUENCY_PATH) * 3600;
return $this->_backendConfig->getValue(self::XML_FREQUENCY_PATH) * 3600;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ class Security
protected $_cache;

/**
* @var \Magento\Core\Model\Store\Config
* @var \Magento\Backend\App\ConfigInterface
*/
protected $_storeConfig;
protected $_backendConfig;

/**
* @var \Magento\Core\Model\Config
Expand All @@ -66,18 +66,18 @@ class Security

/**
* @param \Magento\App\CacheInterface $cache
* @param \Magento\Core\Model\Store\Config $storeConfig
* @param \Magento\Backend\App\ConfigInterface $backendConfig
* @param \Magento\Core\Model\Config $config
* @param \Magento\HTTP\Adapter\CurlFactory $curlFactory
*/
public function __construct(
\Magento\App\CacheInterface $cache,
\Magento\Core\Model\Store\Config $storeConfig,
\Magento\Backend\App\ConfigInterface $backendConfig,
\Magento\Core\Model\Config $config,
\Magento\HTTP\Adapter\CurlFactory $curlFactory
) {
$this->_cache = $cache;
$this->_storeConfig = $storeConfig;
$this->_backendConfig = $backendConfig;
$this->_config = $config;
$this->_curlFactory = $curlFactory;
}
Expand All @@ -97,7 +97,7 @@ private function _canShowNotification()
return true;
}

$adminSessionLifetime = (int) $this->_storeConfig->getConfig('admin/security/session_lifetime');
$adminSessionLifetime = (int) $this->_backendConfig->getValue('admin/security/session_lifetime');
$this->_cache->save(true, self::VERIFICATION_RESULT_CACHE_KEY, array(), $adminSessionLifetime);
return false;
}
Expand Down
106 changes: 0 additions & 106 deletions app/code/Magento/Adminhtml/Block/Backup.php

This file was deleted.

38 changes: 0 additions & 38 deletions app/code/Magento/Adminhtml/Block/Html/Date.php

This file was deleted.

38 changes: 0 additions & 38 deletions app/code/Magento/Adminhtml/Block/Html/Select.php

This file was deleted.

39 changes: 0 additions & 39 deletions app/code/Magento/Adminhtml/Block/Messages.php

This file was deleted.

Loading

0 comments on commit 6e24c0b

Please sign in to comment.