Skip to content

Commit

Permalink
2.0.0.0-dev69
Browse files Browse the repository at this point in the history
* Themes update:
  * LESS styles library added in pub/lib/css/
  * A new Blank theme set as default
* GitHub requests:
  * [#491](#491) -- Fixed bug, incorrect auto-generation Category URL for some groups of symbols (idish, cirrilic, , , and other).
  * [#480](#480) -- Fixing a bug for loading config from local.xml
  * [#472](#472) -- Params passed in pub/index.php being overwritten
  * [#461](#461) -- Use translates for Quote\Address\Total\Shipping
  * [#235](#235) -- Translation escaping
  * [#463](#463) -- allow _resolveArguments to do sequential lookups
  * [#499](#499) Deleted unclosed comment in calendar.css
* Fixed bugs:
  * Fixed a fatal error that occurred with a dependency in pub/errors/report.php
  * Fixed an issue where code coverage failed for Magento\SalesRule\Model\Rule\Action\Discount\CartFixedTest
  * Fixed an issue where PayPal Express Checkout redirected to the PayPal site even though the Allow Guest Checkout option was set to 'No'
  * Fixed an issue where invalid password reset link was sent when resetting customer password from the backend
  * Fixed an issue where it was not possible to download a previously created backup
  * Fixed a security issue with possibility of a XSS injection in the Integration re-authorization flow
  * Fixed an issue where Billing Agreement cancellation from the backend did not work
  * Fixed an issue with the debug section in the developer settings
  * Fixed the unreliable implementation of the fetching authorization header via SOAP
  * Fixed issues with WSDL generation error reporting
  * Fixed an issue with incorrect order of the Recurring Profile tab in Account Customer on the frontend
  * Fixed an issue when the information about a custom option of the 'File' type was not displayed correctly on the recurring profile page
  * Fixed an issue with editing Product template
  * Fixed an issue with duplicated shipping method options during checkout
  * Fixed an issue where flat indexers were re-indexed in shell when they were disabled
  * Fixed an issue where adding a wrong/nonexistent SKU using 'Order by SKU' from My Account caused a fatal error
  * Fixed an issue with the JS/CSS merging functionality
  * Fixed an issue with static view files publication tool used for the 'production' mode
* Modularity improvements:
  * Removed the deprecated GoogleCheckout functionality
  * Removed all dependencies on the RecurringPayment module
  * Removed the Sales module dependencies on Customer models/blocks
  * Renamed the RecurringProfile module to RecurringPayment
  * Resolved dependencies between the Email Templates functionality and other modules
  * Moved Core module lib-only depended components to library
  * Moved CSS URL resolving logic from publisher to the separate CSS pre-processor
  * Re-factored the View publisher
* Framework improvements:
  * Added restrictions on the data populated to the Service Data Object
  * Renamed Data Transfer Object to Service Data Object
  * Updated the view files population tool to support LESS
* Customer Service usage:
  * Refactored the Tax module to use Customer service layer
  * Refactored Customer module Adminhtml internal controllers and helper to use Customer services
  * Added and updated the Customer service APIs
  * Exposed Customer services as REST APIs
* Indexer implementation:
  * Implemented a new optimized Product Price Indexer
* Updated various PHPDoc with the parameter and return types
  • Loading branch information
magento-team committed Mar 18, 2014
1 parent c6856aa commit 2defd65
Show file tree
Hide file tree
Showing 2,434 changed files with 107,333 additions and 58,566 deletions.
54 changes: 54 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,57 @@
2.0.0.0-dev69
=============
* Themes update:
* LESS styles library added in pub/lib/css/
* A new Blank theme set as default
* GitHub requests:
* [#491](https://github.com/magento/magento2/pull/491) -- Fixed bug, incorrect auto-generation Category URL for some groups of symbols (idish, cirrilic, é, ä, and other).
* [#480](https://github.com/magento/magento2/pull/480) -- Fixing a bug for loading config from local.xml
* [#472](https://github.com/magento/magento2/issues/472) -- Params passed in pub/index.php being overwritten
* [#461](https://github.com/magento/magento2/pull/461) -- Use translates for Quote\Address\Total\Shipping
* [#235](https://github.com/magento/magento2/issues/235) -- Translation escaping
* [#463](https://github.com/magento/magento2/pull/463) -- allow _resolveArguments to do sequential lookups
* [#499](https://github.com/magento/magento2/issues/499) Deleted unclosed comment in calendar.css
* Fixed bugs:
* Fixed a fatal error that occurred with a dependency in pub/errors/report.php
* Fixed an issue where code coverage failed for Magento\SalesRule\Model\Rule\Action\Discount\CartFixedTest
* Fixed an issue where PayPal Express Checkout redirected to the PayPal site even though the Allow Guest Checkout option was set to 'No'
* Fixed an issue where invalid password reset link was sent when resetting customer password from the backend
* Fixed an issue where it was not possible to download a previously created backup
* Fixed a security issue with possibility of a XSS injection in the Integration re-authorization flow
* Fixed an issue where Billing Agreement cancellation from the backend did not work
* Fixed an issue with the debug section in the developer settings
* Fixed the unreliable implementation of the fetching authorization header via SOAP
* Fixed issues with WSDL generation error reporting
* Fixed an issue with incorrect order of the Recurring Profile tab in Account Customer on the frontend
* Fixed an issue when the information about a custom option of the 'File' type was not displayed correctly on the recurring profile page
* Fixed an issue with editing Product template
* Fixed an issue with duplicated shipping method options during checkout
* Fixed an issue where flat indexers were re-indexed in shell when they were disabled
* Fixed an issue where adding a wrong/nonexistent SKU using 'Order by SKU' from My Account caused a fatal error
* Fixed an issue with the JS/CSS merging functionality
* Fixed an issue with static view files publication tool used for the 'production' mode
* Modularity improvements:
* Removed the deprecated GoogleCheckout functionality
* Removed all dependencies on the RecurringPayment module
* Removed the Sales module dependencies on Customer models/blocks
* Renamed the RecurringProfile module to RecurringPayment
* Resolved dependencies between the Email Templates functionality and other modules
* Moved Core module lib-only depended components to library
* Moved CSS URL resolving logic from publisher to the separate CSS pre-processor
* Re-factored the View publisher
* Framework improvements:
* Added restrictions on the data populated to the Service Data Object
* Renamed Data Transfer Object to Service Data Object
* Updated the view files population tool to support LESS
* Customer Service usage:
* Refactored the Tax module to use Customer service layer
* Refactored Customer module Adminhtml internal controllers and helper to use Customer services
* Added and updated the Customer service APIs
* Exposed Customer services as REST APIs
* Indexer implementation:
* Implemented a new optimized Product Price Indexer
* Updated various PHPDoc with the parameter and return types

2.0.0.0-dev68
=============
* Cache:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

namespace Magento\AdminNotification\Model\Resource\Inbox;

/**
* AdminNotification Inbox model
Expand All @@ -32,13 +32,12 @@
* @package Magento_AdminNotification
* @author Magento Core Team <[email protected]>
*/
namespace Magento\AdminNotification\Model\Resource\Inbox;

class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractCollection
{
/**
* Resource collection initialization
*
* @return void
*/
protected function _construct()
{
Expand All @@ -48,7 +47,7 @@ protected function _construct()
/**
* Add remove filter
*
* @return \Magento\AdminNotification\Model\Resource\Inbox\Collection
* @return $this
*/
public function addRemoveFilter()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

namespace Magento\AdminNotification\Model\Resource\System;

class Message extends \Magento\Core\Model\Resource\Db\AbstractDb
Expand All @@ -35,6 +34,8 @@ class Message extends \Magento\Core\Model\Resource\Db\AbstractDb

/**
* Resource initialization
*
* @return void
*/
protected function _construct()
{
Expand Down
6 changes: 4 additions & 2 deletions app/code/Magento/AdminNotification/Model/System/Message.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

namespace Magento\AdminNotification\Model\System;

class Message extends \Magento\Core\Model\AbstractModel
implements \Magento\AdminNotification\Model\System\MessageInterface
{
/**
* @return void
*/
protected function _construct()
{
$this->_init('Magento\AdminNotification\Model\Resource\System\Message');
Expand All @@ -45,7 +47,7 @@ public function isDisplayed()
/**
* Retrieve message text
*
* @return text
* @return string
*/
public function getText()
{
Expand Down
Empty file modified app/code/Magento/AdminNotification/etc/module.xml
100755 → 100644
Empty file.
Empty file modified app/code/Magento/Authorizenet/etc/module.xml
100755 → 100644
Empty file.
4 changes: 2 additions & 2 deletions app/code/Magento/Authorizenet/view/frontend/form/cc.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
});
})(jQuery);
</script>
<span id="cancel-please-wait" class="please-wait" style="display:none">
<img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="" class="v-middle" /> <?php echo __('Processing...') ?>
<span id="cancel-please-wait" class="please-wait load indicator" style="display: none" data-text="<?php echo __('Processing...') ?>">
<span><?php echo __('Processing...') ?></span>
</span>
<?php endif;?>
</div>
Expand Down
3 changes: 3 additions & 0 deletions app/code/Magento/Backend/App/ConfigInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,14 @@ public function getValue($path);
*
* @param string $path
* @param mixed $value
* @return void
*/
public function setValue($path, $value);

/**
* Reinitialize config object
*
* @return void
*/
public function reinit();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
namespace Magento\Backend\Block\Widget\Grid\Column\Renderer;

/**
* Grid column widget for rendering grid cells that contains mapped values
Expand All @@ -31,8 +32,6 @@
* @package Magento_Backend
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Backend\Block\Widget\Grid\Column\Renderer;

class Options
extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
{
Expand All @@ -50,7 +49,7 @@ protected function _getOptions()
* Render a grid cell as options
*
* @param \Magento\Object $row
* @return string
* @return string|void
*/
public function render(\Magento\Object $row)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function indexAction()
/**
* Edit configuration section
*
* @return void
* @return \Magento\App\ResponseInterface|void
*/
public function editAction()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@ public function deleteStoreAction()
public function deleteWebsitePostAction()
{
$itemId = $this->getRequest()->getParam('item_id');
$model = $this->_objectManager->create('Magento\Core\Model\Website')->load($itemId);
$model = $this->_objectManager->create('Magento\Core\Model\Website');
$model->load($itemId);

if (!$model) {
$this->messageManager->addError(__('Unable to proceed. Please, try again'));
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Backend/Model/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ public function isLoggedIn()
*
* @param string $msg
* @param string $code
* @return void
* @throws \Magento\Backend\Model\Auth\Exception
* @static
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ public function authenticate($username, $password);
/**
* Login action. Check if given username and password are valid
*
* @param $username
* @param $password
* @param string $username
* @param string $password
* @return $this
* @abstract
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,31 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
* @package Magento_GoogleCheckout
* @package Magento_Backend
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

namespace Magento\GoogleCheckout\Controller;
namespace Magento\Backend\Model\Config\Source\Website;

class Api extends \Magento\App\Action\Action
use Magento\Core\Model\System\Store;

/**
* Admin OptionHash will include the default store (Admin) with the OptionHash.
*
* This class is needed until the layout file supports supplying arguments to an option model.
*/
class AdminOptionHash extends OptionHash
{
public function indexAction()
{
$res = $this->_objectManager->create('Magento\GoogleCheckout\Model\Api')->processCallback();
if ($res === false) {
$this->_forward('noroute');
} else {
exit;
}
}

public function beaconAction()
/**
* @param Store $systemStore
* @param bool $withDefaultWebsite
*/
public function __construct(Store $systemStore, $withDefaultWebsite = true)
{
$this->_objectManager->create('Magento\GoogleCheckout\Model\Api')
->debugData(array('request' => $_SERVER['QUERY_STRING'], 'dir' => 'in'));
parent::__construct($systemStore, $withDefaultWebsite);
}
}


Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
namespace Magento\Backend\Model\Config\Source\Website;

use Magento\Core\Model\System\Store;
use Magento\Option\ArrayInterface;

class OptionHash
implements \Magento\Option\ArrayInterface
class OptionHash implements ArrayInterface
{
/**
* System Store Model
Expand All @@ -38,12 +38,19 @@ class OptionHash
*/
protected $_systemStore;

/**
* @var bool True if the default website (Admin) should be included
*/
protected $_withDefaultWebsite;

/**
* @param Store $systemStore
* @param bool $withDefaultWebsite
*/
public function __construct(Store $systemStore)
public function __construct(Store $systemStore, $withDefaultWebsite = false)
{
$this->_systemStore = $systemStore;
$this->_withDefaultWebsite = $withDefaultWebsite;
}

/**
Expand All @@ -53,7 +60,7 @@ public function __construct(Store $systemStore)
*/
public function toOptionArray()
{
return $this->_systemStore->getWebsiteOptionHash();
return $this->_systemStore->getWebsiteOptionHash($this->_withDefaultWebsite);
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Backend/Model/Locale/Resolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class Resolver extends \Magento\Locale\Resolver
* @param \Magento\Locale\ScopeConfigInterface $scopeConfig
* @param \Magento\AppInterface $app
* @param \Magento\LocaleFactory $localeFactory
* @param $defaultLocalePath
* @param string $defaultLocalePath
* @param \Magento\ObjectManager $objectManager
* @param \Magento\Backend\Model\Session $session
* @param Manager $localeManager
Expand Down
5 changes: 4 additions & 1 deletion app/code/Magento/Backend/Model/Menu/Item/Validator.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ class Validator
*/
protected $_validators = array();

/**
* Constructor
*/
public function __construct()
{
$idValidator = new \Zend_Validate();
Expand Down Expand Up @@ -83,7 +86,7 @@ public function __construct()
/**
* Validate menu item params
*
* @param $data
* @param array $data
* @return void
* @throws \InvalidArgumentException
* @throws \BadMethodCallException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@

interface GeneratorInterface
{
/**
* @param \Magento\Object $item
* @return string
*/
public function getUrl($item);

}
6 changes: 3 additions & 3 deletions app/code/Magento/Backend/etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,13 @@
<comment>Leave empty for access from any location.</comment>
</field>
</group>
<group id="debug" translate="label" type="text" sortOrder="20" showInDefault="0" showInWebsite="1" showInStore="1">
<group id="debug" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Debug</label>
<field id="template_hints" translate="label" type="select" sortOrder="20" showInDefault="0" showInWebsite="1" showInStore="1">
<field id="template_hints" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Template Path Hints</label>
<source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
</field>
<field id="template_hints_blocks" translate="label" type="select" sortOrder="21" showInDefault="0" showInWebsite="1" showInStore="1">
<field id="template_hints_blocks" translate="label" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Add Block Names to Hints</label>
<source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
</field>
Expand Down
Empty file modified app/code/Magento/Backend/etc/module.xml
100755 → 100644
Empty file.
1 change: 0 additions & 1 deletion app/code/Magento/Backend/view/adminhtml/admin/login.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<link rel="stylesheet" href="<?php echo $this->getViewFileUrl('css/admin.css') ?>" media="all" />
<link rel="stylesheet" href="<?php echo $this->getViewFileUrl('css/header.css') ?>" media="all" />
<link rel="stylesheet" href="<?php echo $this->getViewFileUrl('css/pages.css') ?>" media="all" />
<?php /* <link rel="stylesheet" href="<?php echo $this->getViewFileUrl('css/styles.css') ?>" media="all" /> */?>
<link rel="stylesheet" href="<?php echo $this->getViewFileUrl('mui/utils.css') ?>" media="all" />

<script src="<?php echo $this->getViewFileUrl('jquery/jquery.js') ?>"></script>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Backup/Helper/Data.php
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public function getExtensions()
public function generateBackupDownloadName(\Magento\Backup\Model\Backup $backup)
{
$additionalExtension = $backup->getType() == \Magento\Backup\Factory::TYPE_DB ? '.sql' : '';
return $backup->getType() . '-' . date('YmdHis', $backup->getTime()) . $additionalExtension . '.'
return $backup->getTime() . '_' . $backup->getType() . '_' . $backup->getName() . $additionalExtension . '.'
. $this->getExtensionByType($backup->getType());
}

Expand Down
Loading

0 comments on commit 2defd65

Please sign in to comment.