Skip to content

Commit

Permalink
Merge remote-tracking branch 'mainline/develop' into MAGETWO-39841-lo…
Browse files Browse the repository at this point in the history
…g-area-code
  • Loading branch information
Olga Kopylova committed Jul 24, 2015
2 parents 9133065 + 57f5ab8 commit 3593d18
Show file tree
Hide file tree
Showing 736 changed files with 10,463 additions and 2,864 deletions.
162 changes: 162 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,165 @@
1.0.0-beta
=============
* Framework improvements:
* Improved the way the return type of a method is derived during WSDL generation
* Added the ability to retrieve a list of available endpoints for a given Magento instance
* Search improvements:
* Introduced the Search field in scope of Enhanced Data Grids on CMS
* Introduced the Search Indexer interface and XML declaration
* Introduced the Search module API to support the search functionality
* Product attributes have different weight by default
* Implemented per store full text index
* Search API moved from the Catalog to the Search module
* Various improvements:
* Payment gateway infrastructure improvements
* Removed the outdated GoogleShopping module
* Implemented the integration with Braintree payment gateway
* Moved the Authorize.net payment method back to CE
* Updated processing of the fraud status for orders
* Added data attributes for checkout sections
* The enhanced grid component is applied to the Product grid and the whole Sales module
* Added the ability to create account during and after the checkout process is complete
* Enabled coupon code in URL for empty carts
* Added new icons to the admin-icons font
* Improved the configurable product creation flow to be consistent with other product types creation
* Eliminated email markup duplication and simplified email content management by including footer/header content and styles from a single place for email templates
* Fixed bugs:
* Fixed an issue where there was no successful message about VAT validation
* Fixed an issue where it was not possible to change State/Province in customer address
* Fixed an issue where the "Array to string conversion" notice appeared during order creation if custom address attribute existed
* Fixed an issue in API service where a customer was created even when there was a validation error
* Fixed an issue where a new custom theme added to the file system, was not accessible in Admin
* Fixed an issue where it was impossible to save a customer record in Admin after selecting to add a new address and then deleting the address fields
* Fixed an issue where it was impossible to add to cart by SKU more, than one product at a time on the storefront
* Fixed an issue where it was impossible to place an order on the storefront using PayPal Payments Pro
* Fixed an issue where checkout was performed without applying existing and active catalog rules
* Fixed an issue where category displayed outdated prices until page cache was manually reset or timed out
* Fixed with the wrong label for catalog price rules processing dropdown
* Fixed the copyright text on the storefront
* Fixed an issue where the Create new Customer Account form was broken on the storefront
* Fixed an issue where CMS page was saved automatically once a widget is added to the page content
* Fixed an issue where a user was redirected to the Orders page after clicking the Get Payment Update in Admin
* Fixed a comment in the \Magento\Framework\App\Http::launch() method
* Fixed an issue where editable multi-select fields were not always displayed on the new tax rule creation page
* Fixed a JavaScript error which blocked guest checkout if JavaScript bundling was enabled
* Fixed an issue where the Cookie Restriction Mode block was not displayed on the storefront
* Fixed an issue where the Tax Rate edit form showed an empty selected value instead of *
* Fixed an issue for Internet Explorer v.11 where the Remove button in the mini shopping cart did not work
* Fixed an issue where the Email field was duplicated on the send invitation form
* Fixed an issue where the product images where not displayed on a storefront product page for simple products
* Fixed the error handling for PHP settings check in Setup Wizard which was caused by timeout
* Fixed an issue where a credit card type was undefined in iframe request
* Fixed the iframe payment method flow
* Fixed an issue where it was possible to place an order with the empty Purchase Order Number required field
* Fixed an issue where a loader was not displayed in mini shopping cart
* Fixed an issue where autocomplete was enabled on credit card form
* Fixed issues with PayPal conflict resolution
* Fixed cache collisions for static view files cache
* Fixed an issue where an admin user with limited access to only Content could not access CMS pages in Admin
* Fixed an issue where "Privacy and Cookie Policy" CMS page content was unreadable
* Fixed an issue where shopping cart became empty if a customer configured an item to be the same as already existing in the shopping cart
* Fixed an issue where Maestro credit card did not pass validation
* Fixed an issue where a custom order status appeared in the Order State drop down
* Fixed an issue where it was impossible to add products to a package and create a shipping label
* Fixed the incorrect text message in the Products Requiring Attention grid for product with enabled Qty Increments
* Fixed an issue where the thumbnail image option was not applied correctly for grouped products
* Fixed an issue where the Newsletter Subscribers grid was not displayed
* Fixed an issue where the order number was absent on the success page for PayPal Advanced Checkout
* Fixed non-working sales tax report
* Fixed an issue where sales reports with empty rows did not work
* Fixed the broken layout on the shipping checkout step for the Blank theme
* Fixed an issue where the Phone Number hint was displayed outside of the visible screen when adding a new address
* Fixed the style for the Add button on certain pages in Admin
* Fixed an issue where it was impossible to confirm signing of a billing agreement during checkout
* Fixed an issue with missing events subscriptions
* Fixed the incorrect message displayed when trying to delete a product from mini shopping cart
* Fixed an issue where it was possible to share a wish list after a short-term session was expired when the Persistent Shopping Cart functionality was enabled
* Fixed an issue where the "optional" placeholder was displayed for the Password field when logging in during checkout
* Fixed an issue where placing an order with the same parameters was becoming slower on each iteration
* Fixed an issue where the controls on the Review & Payments page were disabled in case PayPal transaction had been declined during checkout
* Fixed an issue where the terms and conditions links were always displayed during checkout
* Fixed an issue where customer address was not saved during checkout
* Fixed an issue where tax information was shown in order summary for a guest customer
* Fixed an issue with currency in different locales
* Fixed an issue where tax information was not displayed in mini shopping cart
* Fixed an issue with the Display Full Tax Summary configuration setting
* Fixed an issue with Advanced Fraud Protection in the Braintree payment method
* Fixed an issue with tax and FPT information missing in the order summary on the storefront
* Fixed the auto load error after running setup:di:compile
* Fixed an issue with publishing files in production mode
* Fixed a cron re-indexing issue
* Fixed an issue with JS minification errors which appeared when adding products to cart
* Fixed the broken Reset Password link in a welcome email for a customer created in Admin
* Fixed an issue where WSDL generated for any Web API service had an invalid element
* Fixed the records displaying order in the Sales grids
* Fixed an issue with invalid path parsing in exclude list during bundle collecting
* Fixed an issue where there was no success message after place order via Payflow Link on mobile device
* Fixed an issue where it was not possible to place order as a guest via Authorize.net Direct Post
* Fixed an issue where it was not possible to place order via Express Checkout with enabled Terms and Conditions
* Fixed an issue where the last transaction ID was displayed for order placed within PayPal Payflow Link on the storefront
* Fixed an issue where it was not possible to perform products mass update in Internet Explorer
* Fixed an issue where product did not appear on front after category change and indexers set to update on schedule
* Fixed an issue where special chars in custom options were replaced with HTML entities
* Fixed the invalid title of the Update Attributes page in Admin
* Fixed performance issue in the storefront search
* Fixed the _initCustomer() method in the Customer module controllers
* Fixed an issue where the customer_save_after_data_object event dispatched a few times
* Fixed an issue where it was not possible to create customer account from order success page
* Fixed an issue where styles were missing on the storefront
* Fixed the "No such entity with cartId = " error on One Page Checkout if online payment was used
* Fixed an issue where flush of one type of cache made other flushed
* Fixed sales orders grid for orders placed using PayPal when the PayPal module was disabled
* Fixed an issue where loader hanged out if admin did not specify shipping address or method for order
* Fixed an irrelevant note in Payflow Pro section on One Page Checkout
* Fixed an issue where an HTML tag was displayed in the Instructions field of the bank transfer payment form during checkout on the storefront
* Fixed an issue where it was not possible to place order as a guest via Authorize.net Direct Post
* Fixed an issue where the Refund and Refund Offline buttons styles on the Credit Memo page
* Fixed an issue where Modal window for "Sign In" was not closed when clicking outside
* Fixed an issue where the Compare Products functionality was accessible in a store with the responsive Blank theme applied when browsing using Iphone6
* Fixed incorrect relative paths in LESS files
* Fixed an issue where it was not possible to save newsletter subscription information of a customer in Admin
* Fixed an issue where order number was missing on PayPal (Payflow) Express Checkout solutions
* Fixed an issue where Product quantity was still displayed in the mini shopping cart after Place Order on storefront
* Fixed indexer failure with re-index on schedule
* Fixed catalog price rule calculation for Group price
* Fixed an issue where specific product tabs were accumulated on switching between product templates
* Fixed an issue where grid actions in custom options dialog did not work
* Fixed an issue where page cache was not invalidated when products were changed via mass action
* Fixed an issue where catalog page was not updated after product returned to stock again if Varnish was enabled
* Fixed incorrect price of configurable product on storefront
* Fixed an issue where the Catalog page in Admin did not work in production mode
* Fixed an issue where the Add to cart button did not redirect to the configuration page for configurable products
* Fixed an issue where it was not possible to perform mass delete having used the Select All functionality to select the products
* Fixed an issue where PayPal Express Checkout was always displayed as disabled in Internet Explorer
* Fixed an issue where PayPal Express labels on checkout were small
* Fixed an issue where the Configure Product modal window blended in with page content during order creation
* Fixed an issue where hints behaved not user-friendly on the storefront
* Fixed an issue with exception when creating account for guest customer after placing order within Express Checkout
* Fixed orders grid mass actions
* Fixed invoice grid search on Invoices tab of Order View page
* Fixed an issue where gallery images were not loaded for Configurable Product
* Fixed an issue where currency rates were displayed incorrectly
* Fixed exception framework misuse in indexers
Tests:
* Increased code coverage of the Theme module
* Refactored some methods to decrease C.R.A.P index and implemented unit tests for CMS, Sitemap and Widget modules
* Sample data installation covered with unit tests
* Moved all test data for functional tests to repositories
* Increased test coverage for setup fixtures which are used for performance tests
* Updated some variations for checkout related automated tests
* Increased SOAP connection timeout to prevent SOAP failures in API tests
* GitHub issues and requests:
* [#1272](https://github.com/magento/magento2/issues/1272) -- In dashboard Last Orders items quantity showing wrong some times
* [#1341](https://github.com/magento/magento2/issues/1341) -- [Question] How to specify attributes to load on ProductRepository::getList()
* [#1370](https://github.com/magento/magento2/issues/1370) -- EAV Attribute Repository linking to catalog_eav_attribute
* [#1382](https://github.com/magento/magento2/issues/1382) -- setup:install can now accept {{base_url}} as input to --base-url
* [#1385](https://github.com/magento/magento2/pull/1385) -- Specify `Magento_Catalog` module on template for sorting
* [#1411](https://github.com/magento/magento2/issues/1411) -- No error message shown when purchase qty mismatch the 'Qty Increments' setup
* [#1420](https://github.com/magento/magento2/pull/1420) -- Make Api\SearchResults implement Api\SearchResultsInterface
* [#1421](https://github.com/magento/magento2/pull/1421) -- Rename Api\SearchCriteriaBuilder::addFilter() to addFilters()
* [#1427](https://github.com/magento/magento2/issues/1427) -- Fatal error: Call to a member function format() on null in magento2/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php on line 260
* [#1434](https://github.com/magento/magento2/issues/1434) -- Failed to add product variation

0.74.0-beta16
=============
* Framework improvements:
Expand Down
3 changes: 3 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ module.exports = function (grunt) {
[
taskDir + '/mage-minify',
taskDir + '/deploy',
taskDir + '/black-list-generator',
taskDir + '/clean-black-list',
taskDir + '/static',
'time-grunt'
].forEach(function (task) {
require(task)(grunt);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
namespace Magento\AdminNotification\Controller\Adminhtml;

class Notification extends \Magento\Backend\App\AbstractAction
abstract class Notification extends \Magento\Backend\App\AbstractAction
{
/**
* @return bool
Expand Down
10 changes: 5 additions & 5 deletions app/code/Magento/AdminNotification/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"magento/module-store": "0.74.0-beta16",
"magento/module-backend": "0.74.0-beta16",
"magento/module-media-storage": "0.74.0-beta16",
"magento/framework": "0.74.0-beta16",
"magento/module-store": "1.0.0-beta",
"magento/module-backend": "1.0.0-beta",
"magento/module-media-storage": "1.0.0-beta",
"magento/framework": "1.0.0-beta",
"lib-libxml": "*",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.74.0-beta16",
"version": "1.0.0-beta",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
18 changes: 9 additions & 9 deletions app/code/Magento/AdvancedPricingImportExport/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"magento/module-catalog": "0.74.0-beta16",
"magento/module-catalog-inventory": "0.74.0-beta16",
"magento/module-eav": "0.74.0-beta16",
"magento/module-import-export": "0.74.0-beta16",
"magento/module-catalog-import-export": "0.74.0-beta16",
"magento/module-customer": "0.74.0-beta16",
"magento/module-store": "0.74.0-beta16",
"magento/framework": "0.74.0-beta16",
"magento/module-catalog": "1.0.0-beta",
"magento/module-catalog-inventory": "1.0.0-beta",
"magento/module-eav": "1.0.0-beta",
"magento/module-import-export": "1.0.0-beta",
"magento/module-catalog-import-export": "1.0.0-beta",
"magento/module-customer": "1.0.0-beta",
"magento/module-store": "1.0.0-beta",
"magento/framework": "1.0.0-beta",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.74.0-beta16",
"version": "1.0.0-beta",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Authorization/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"description": "Authorization module provides access to Magento ACL functionality.",
"require": {
"php": "~5.5.0|~5.6.0",
"magento/module-backend": "0.74.0-beta16",
"magento/framework": "0.74.0-beta16",
"magento/module-backend": "1.0.0-beta",
"magento/framework": "1.0.0-beta",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.74.0-beta16",
"version": "1.0.0-beta",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
*/
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;

class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create
abstract class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create
{
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* @author Magento Core Team <[email protected]>
*/
class Payment extends \Magento\Framework\App\Action\Action
abstract class Payment extends \Magento\Framework\App\Action\Action
{
/**
* Core registry
Expand Down
18 changes: 9 additions & 9 deletions app/code/Magento/Authorizenet/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
"magento/module-sales": "0.74.0-beta16",
"magento/module-store": "0.74.0-beta16",
"magento/module-quote": "0.74.0-beta16",
"magento/module-checkout": "0.74.0-beta16",
"magento/module-backend": "0.74.0-beta16",
"magento/module-payment": "0.74.0-beta16",
"magento/module-catalog": "0.74.0-beta16",
"magento/framework": "0.74.0-beta16",
"magento/module-sales": "1.0.0-beta",
"magento/module-store": "1.0.0-beta",
"magento/module-quote": "1.0.0-beta",
"magento/module-checkout": "1.0.0-beta",
"magento/module-backend": "1.0.0-beta",
"magento/module-payment": "1.0.0-beta",
"magento/module-catalog": "1.0.0-beta",
"magento/framework": "1.0.0-beta",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.74.0-beta16",
"version": "1.0.0-beta",
"license": [
"proprietary"
],
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Backend/App/Action.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
/**
* @SuppressWarnings(PHPMD.NumberOfChildren)
*/
class Action extends \Magento\Backend\App\AbstractAction
abstract class Action extends \Magento\Backend\App\AbstractAction
{
}
18 changes: 18 additions & 0 deletions app/code/Magento/Backend/Block/Cache/Additional.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@

class Additional extends \Magento\Backend\Block\Template
{
/**
* Check if application is in production mode
*
* @return bool
*/
public function isInProductionMode()
{
return $this->_appState->getMode() === \Magento\Framework\App\State::MODE_PRODUCTION;
}

/**
* @return string
*/
Expand All @@ -22,4 +32,12 @@ public function getCleanMediaUrl()
{
return $this->getUrl('*/*/cleanMedia');
}

/**
* @return string
*/
public function getCleanStaticFilesUrl()
{
return $this->getUrl('*/*/cleanStaticFiles');
}
}
2 changes: 1 addition & 1 deletion app/code/Magento/Backend/Controller/Adminhtml/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* Auth backend controller
*/
class Auth extends AbstractAction
abstract class Auth extends AbstractAction
{
/**
* Check if user has permissions to access this controller
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Backend/Controller/Adminhtml/Cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use Magento\Backend\App\Action;
use Magento\Framework\Exception\LocalizedException;

class Cache extends Action
abstract class Cache extends Action
{
/**
* @var \Magento\Framework\App\Cache\TypeListInterface
Expand Down
Loading

0 comments on commit 3593d18

Please sign in to comment.