Skip to content

Commit 2defd65

Browse files
committedMar 18, 2014
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](#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
1 parent c6856aa commit 2defd65

File tree

2,434 files changed

+107333
-58566
lines changed

Some content is hidden

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

2,434 files changed

+107333
-58566
lines changed
 

‎CHANGELOG.md

+54
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,57 @@
1+
2.0.0.0-dev69
2+
=============
3+
* Themes update:
4+
* LESS styles library added in pub/lib/css/
5+
* A new Blank theme set as default
6+
* GitHub requests:
7+
* [#491](https://github.com/magento/magento2/pull/491) -- Fixed bug, incorrect auto-generation Category URL for some groups of symbols (idish, cirrilic, é, ä, and other).
8+
* [#480](https://github.com/magento/magento2/pull/480) -- Fixing a bug for loading config from local.xml
9+
* [#472](https://github.com/magento/magento2/issues/472) -- Params passed in pub/index.php being overwritten
10+
* [#461](https://github.com/magento/magento2/pull/461) -- Use translates for Quote\Address\Total\Shipping
11+
* [#235](https://github.com/magento/magento2/issues/235) -- Translation escaping
12+
* [#463](https://github.com/magento/magento2/pull/463) -- allow _resolveArguments to do sequential lookups
13+
* [#499](https://github.com/magento/magento2/issues/499) Deleted unclosed comment in calendar.css
14+
* Fixed bugs:
15+
* Fixed a fatal error that occurred with a dependency in pub/errors/report.php
16+
* Fixed an issue where code coverage failed for Magento\SalesRule\Model\Rule\Action\Discount\CartFixedTest
17+
* Fixed an issue where PayPal Express Checkout redirected to the PayPal site even though the Allow Guest Checkout option was set to 'No'
18+
* Fixed an issue where invalid password reset link was sent when resetting customer password from the backend
19+
* Fixed an issue where it was not possible to download a previously created backup
20+
* Fixed a security issue with possibility of a XSS injection in the Integration re-authorization flow
21+
* Fixed an issue where Billing Agreement cancellation from the backend did not work
22+
* Fixed an issue with the debug section in the developer settings
23+
* Fixed the unreliable implementation of the fetching authorization header via SOAP
24+
* Fixed issues with WSDL generation error reporting
25+
* Fixed an issue with incorrect order of the Recurring Profile tab in Account Customer on the frontend
26+
* Fixed an issue when the information about a custom option of the 'File' type was not displayed correctly on the recurring profile page
27+
* Fixed an issue with editing Product template
28+
* Fixed an issue with duplicated shipping method options during checkout
29+
* Fixed an issue where flat indexers were re-indexed in shell when they were disabled
30+
* Fixed an issue where adding a wrong/nonexistent SKU using 'Order by SKU' from My Account caused a fatal error
31+
* Fixed an issue with the JS/CSS merging functionality
32+
* Fixed an issue with static view files publication tool used for the 'production' mode
33+
* Modularity improvements:
34+
* Removed the deprecated GoogleCheckout functionality
35+
* Removed all dependencies on the RecurringPayment module
36+
* Removed the Sales module dependencies on Customer models/blocks
37+
* Renamed the RecurringProfile module to RecurringPayment
38+
* Resolved dependencies between the Email Templates functionality and other modules
39+
* Moved Core module lib-only depended components to library
40+
* Moved CSS URL resolving logic from publisher to the separate CSS pre-processor
41+
* Re-factored the View publisher
42+
* Framework improvements:
43+
* Added restrictions on the data populated to the Service Data Object
44+
* Renamed Data Transfer Object to Service Data Object
45+
* Updated the view files population tool to support LESS
46+
* Customer Service usage:
47+
* Refactored the Tax module to use Customer service layer
48+
* Refactored Customer module Adminhtml internal controllers and helper to use Customer services
49+
* Added and updated the Customer service APIs
50+
* Exposed Customer services as REST APIs
51+
* Indexer implementation:
52+
* Implemented a new optimized Product Price Indexer
53+
* Updated various PHPDoc with the parameter and return types
54+
155
2.0.0.0-dev68
256
=============
357
* Cache:

‎app/code/Magento/AdminNotification/Model/Resource/Inbox/Collection.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2424
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
26-
26+
namespace Magento\AdminNotification\Model\Resource\Inbox;
2727

2828
/**
2929
* AdminNotification Inbox model
@@ -32,13 +32,12 @@
3232
* @package Magento_AdminNotification
3333
* @author Magento Core Team <core@magentocommerce.com>
3434
*/
35-
namespace Magento\AdminNotification\Model\Resource\Inbox;
36-
3735
class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractCollection
3836
{
3937
/**
4038
* Resource collection initialization
4139
*
40+
* @return void
4241
*/
4342
protected function _construct()
4443
{
@@ -48,7 +47,7 @@ protected function _construct()
4847
/**
4948
* Add remove filter
5049
*
51-
* @return \Magento\AdminNotification\Model\Resource\Inbox\Collection
50+
* @return $this
5251
*/
5352
public function addRemoveFilter()
5453
{

0 commit comments

Comments
 (0)