Skip to content

Commit 78a80d1

Browse files
author
Bogdan Plieshka
committed
MAGETWO-37920: Add documentation for Styles Library components
- Merge branch 'develop' into MAGETWO-37921 - Conflicts: -- lib/web/css/docs/docs.css -- lib/web/css/docs/forms.html -- lib/web/css/docs/icons.html
2 parents 6320224 + 4fd68c3 commit 78a80d1

File tree

3,202 files changed

+141530
-36524
lines changed

Some content is hidden

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

3,202 files changed

+141530
-36524
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ atlassian*
3131
!/pub/media/customer/.htaccess
3232
/pub/media/downloadable/*
3333
!/pub/media/downloadable/.htaccess
34+
/pub/media/import/*
35+
!/pub/media/import/.htaccess
3436
/pub/media/theme/*
3537
/pub/media/theme_customization/*
3638
!/pub/media/theme_customization/.htaccess

.htaccess

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,6 @@
6565
SecFilterScanPOST Off
6666
</IfModule>
6767

68-
<IfModule mod_headers.c>
69-
############################################
70-
## prevent clickjacking
71-
72-
Header set X-Frame-Options SAMEORIGIN
73-
</IfModule>
74-
7568
<IfModule mod_deflate.c>
7669

7770
############################################
@@ -187,4 +180,4 @@
187180
## If running in cluster environment, uncomment this
188181
## http://developer.yahoo.com/performance/rules.html#etags
189182

190-
#FileETag none
183+
#FileETag none

.travis.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ env:
99
- TEST_SUITE=integration_integrity
1010
- TEST_SUITE=static_phpcs
1111
- TEST_SUITE=static_annotation
12+
cache:
13+
apt: true
14+
directories:
15+
- $HOME/.composer/cache
16+
- $HOME/.cache/bin
1217
matrix:
1318
exclude:
1419
- php: 5.6
@@ -18,6 +23,16 @@ matrix:
1823
before_install:
1924
- sudo apt-get update -qq
2025
- sudo apt-get install -y -qq postfix
26+
- sh -c 'if [ "$CASHER_DIR" ]; then
27+
if [ -x $HOME/.cache/bin/composer ]; then
28+
$HOME/.cache/bin/composer self-update; echo '';
29+
else
30+
mkdir -p $HOME/.cache/bin;
31+
curl --connect-timeout 30 -sS https://getcomposer.org/installer \
32+
| php -- --install-dir $HOME/.cache/bin/ --filename composer;
33+
fi
34+
fi'
35+
- export PATH="$HOME/.cache/bin:$PATH"
2136
before_script:
2237
# Mock mail
2338
- sudo service postfix stop
@@ -46,7 +61,7 @@ before_script:
4661
# Change memory_limit for travis
4762
- echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
4863
- phpenv rehash;
49-
- composer install --no-interaction --dev
64+
- composer install --no-interaction --prefer-dist
5065
script:
5166
# Unit tests
5267
- sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi"
@@ -59,4 +74,4 @@ script:
5974
# Static tests [Code Style]
6075
- sh -c "if [ '$TEST_SUITE' = 'static_phpcs' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testCodeStyle'; fi"
6176
# Static tests [Code Style]
62-
- sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"
77+
- sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"

CHANGELOG.md

Lines changed: 139 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,139 @@
1+
0.74.0-beta16
2+
=============
3+
* Framework improvements:
4+
* Improved declaration of JS widgets with mixins node
5+
* Optimized Magento\Framework\View\Element\Template for production mode
6+
* Added color picker JS library
7+
* Various improvements:
8+
* Implemented enhanced checkout flow
9+
* Increased security of search filters
10+
* Added price variation caching based on WEEE
11+
* Updated adapter in payment gateway
12+
* Data version control was implemented on Customer and Quote modules to reduce number of unnecessary model saves
13+
* Optimized Magento\PageCache\Model\Observer\ProcessLayoutRenderElement::execute
14+
* Added event to make an ability to add elements on a main tab of attribute editing page
15+
* Email markup duplication is eliminated and email content management is simplified
16+
* Implemented and ability to update/replace and export advanced product prices
17+
* Added import history
18+
* Implemented and ability to export configurable products
19+
* Payment improvements:
20+
* Moved PayPal solutions back to CE
21+
* PayPal Payments Standard is updated to PayPal Express Checkout API
22+
* Improved conflict resolution rules for PayPal configuration
23+
* Tests:
24+
* Increased timeout for HTTP requests in api-functional test framework to avoid error "HTTP request failed"
25+
* Increased unit test coverage for Reports, CatalogRule, Config and CurrencySymbol modules
26+
* Functional tests maintenance for Tax, Sales, Reports modules
27+
* Created fixture generation scripts for functional tests
28+
* Fixed CheckoutWithGiftMessagesTest functional test
29+
* Fixed bugs:
30+
* Fixed wrong redirect after adding to compare, wish list or cart from private content blocks
31+
* Fixed an issue where tax information was not saved in orders
32+
* Fixed an issue where total amount was not set in the correct place
33+
* Fixed an issue where product options details were missing while adding to wish list
34+
* Fixed an issue with empty customer first name and last name when new address is added on backend
35+
* Fixed an issue where it was not possible to create customer from backend if there was custom attribute
36+
* Fixed an issue where email could not be retrieved from Quote address after adding an address in backend order creation
37+
* Fixed XSS in order details
38+
* GitHub issues and requests:
39+
* [#1389](https://github.com/magento/magento2/pull/1389) -- Replaced string check with simpler logic
40+
* [#1412](https://github.com/magento/magento2/pull/1412) -- Fix typo - change getChildhtml to getChildHtml
41+
* [#1415](https://github.com/magento/magento2/pull/1415) -- Add placeholder containers to invoice and shipment creation sections
42+
43+
0.74.0-beta15
44+
=============
45+
* Framework improvements:
46+
* Introduced Drag&Drop Columns functionality in scope of Enhanced Data Grids on CMS
47+
* Improved Column Actions functionality in scope of Enhanced Data Grids on CMS
48+
* Adapted Payment\Gateway framework to client requirements
49+
* Removed 'field_expr' option from filters
50+
* Added product details renderer list support on Catalog category page
51+
* Security: Clickjacking solution - introduced X-Frame-Options
52+
* Gift message was moved to shopping cart
53+
* Improved simple products export
54+
* Separated import of advanced prices
55+
* Changed 'updated_at' filter for products export
56+
* Added the link with sample product import file
57+
* Cleared and improved the messages and names in different modules
58+
* Added mbstring extension as a requirement
59+
* Tests:
60+
* Increased test coverage for the CatalogInventory, Email and Newsletter modules
61+
* Added wait to form element before filling a value in functional tests
62+
* Increased test coverage of Reports module
63+
* Functional tests were fixed and maintained
64+
* Fixed bugs:
65+
* Fixed loading of images from database media storage with separate connection
66+
* Eliminated duplication of ComposerInformation class in Magento Framework and Setup Application
67+
* Fixed an error message format inconsistency in theme uninstall command
68+
* Fixed an issue where incorrect action name checks led to customer info leak
69+
* Fixed an issue where /magento_version exposed too detailed version information
70+
* Fixed an issue where generate data failed when table prefix exceeded length of 5
71+
* Fixed an issue where product options were displayed not styled on "Edit Product from Wishlist" Frontend page
72+
* Fixed an issue where payment information was displayed broken on "Order Management" Backend page forms
73+
* Fixed an issue where admin panel pop-ups contained lots of empty space
74+
* Fixed an issue where Customer account form was displayed broken
75+
* Fixed an issue where all text fields were invisible in Backend "Add New Customer" page
76+
* Fixed XSS issues in Magento - wishlist sending
77+
* Fixed an issue where it was unable to specify all values of "Multiple Select" Product Custom Option to purchase
78+
* Fixed an issue where setting a permission for 'ALL Groups' produced an error if other permissions existed
79+
* Fixed an issue where stock was not updated when Stock indexer was in Update on Schedule mode
80+
* Fixed an issue where it was not possible to update stock items of product using API service
81+
* Fixed an issue where Customer review changes in backend were not reflected in frontend until cache was cleared
82+
* Fixed an issue where cache was not updated when changing stock status using mass action
83+
* Fixed an issue where Stock Items API service to return low stock information did not return correct results
84+
* Fixed an issue where found records in global search in Backend could not be selected via keyboard
85+
* Fixed an issue where Category menu items went out of screen when page side was reached
86+
* Fixed an issue where subcategories in menu were shown instantly when user moved mouse quickly
87+
* Fixed an issue where popup header was our of window range while creating group product
88+
* Fixed an issue where region field was absent in customer address form on backend for "United Kingdom" country
89+
* Fixed an ability to edit the Order from Admin panel
90+
* Fixed an issue where email could not be retrieved from \Magento\Quote\Api\Data\AddressInterface after adding an address on OnePageCheckout
91+
* Fixed an issue where Products were not displayed correctly across all storeviews of the catalog
92+
* GitHub issues:
93+
* [#1378](https://github.com/magento/magento2/issues/1319) -- jquery-cookie.js is not published by deploy tool in production mode
94+
* [#1314](https://github.com/magento/magento2/pull/1314)-- Fixed a bug where type attribute for tag button was missing
95+
* [#1354](https://github.com/magento/magento2/pull/1354) -- Add gitter.im badge to ReadMe.
96+
* [#1378](https://github.com/magento/magento2/pull/1378) -- Fix incorrect js filename
97+
98+
0.74.0-beta14
99+
=============
100+
* Framework improvements:
101+
* Introduced an ability to uninstall modules which were installed via composer (bin/magento module:uninstall 'moduleName')
102+
* Introduced an ability to uninstall themes (bin/magento theme:uninstall 'themeName')
103+
* Introduced an ability to backup and rollback DB and Media via CLI (bin/magento setup:backup, options are --code, --db or --media)
104+
* Introduced an ability to uninstall language packages (bin/magento i18n:uninstall 'languagePack')
105+
* Introduced API notation for the following modules: Backend, Backup, Cron, Log, PageCache
106+
* Added join processors to search services, joined config for services with extension attributes
107+
* Renamed hidden_tax to discount_tax_compensation
108+
* The customer address entity table was transformed from EAV into a flat model to minimize database operations
109+
* Fixed bugs:
110+
* Fixed an issue where Setup Wizard failed on readiness check when Magento was deployed by composer create-project
111+
* Fixed the local file path disclosure when trying to browse image cache directory
112+
* Fixed an issue where development errors resulted in too many redirects
113+
* Fixed an integration test failure in Reports ViewedTest
114+
* Fixed an issue where it was impossible to save existent Grouped Product with no child items
115+
* Fixed an issue where message "We don't have as many "conf1" as you requested" appeared
116+
* Fixed an issue where second product from bundle product was ordered as separate item after checkout
117+
* Fixed an issue where configs for payments and shipping providers were not encrypted
118+
* Fixed an issue where Table Rates shipping method did not work
119+
* Fixed an issue where admin could not set locale properly on Account page
120+
* Fixed incomplete generated results of single tenant compiler
121+
* Fixed an issue with full page caching where one set of prices was cached for all customers
122+
* Fixed incorrect urls for private content
123+
* Fixed an issue where it was not possible to assign a product link to another product using API
124+
* Fixed an issue where zip code was not displayed as required field on Create New Order page
125+
* Fixed the Sample Data re-installation
126+
* Fixed random fails on inventory tab for test CreateSimpleProductEntityTest
127+
* Tests:
128+
* Covered various modules with unit tests
129+
* Functional tests fixed and maintained
130+
* GitHub issues:
131+
* [#1156](https://github.com/magento/magento2/pull/1156) -- Moves common code to all auto-generated Interceptor classes into a trait
132+
* [#1206](https://github.com/magento/magento2/pull/1206) -- Allow modules to live outside of app/code directory
133+
* [#1245](https://github.com/magento/magento2/pull/1245) -- Unable to save product per website wise
134+
* [#1347](https://github.com/magento/magento2/pull/1347) -- Fixed failing Install during integration tests (MAGETWO-38482)
135+
* [#1368](https://github.com/magento/magento2/pull/1368) -- Fix typo in getCurrentCategoryKey
136+
1137
0.74.0-beta13
2138
=============
3139
* Framework improvements:
@@ -107,14 +243,14 @@
107243
* Improved component Advanced Filtering component in scope of Enhanced Data Grids on CMS
108244
* Fixed bugs:
109245
* Fixed an issue where incorrect keys in REST request body allowed the request to go through successfully
110-
* Fixed an issue where interceptors were Generated with Invalid __wakeup()
246+
* Fixed an issue where interceptors were Generated with Invalid __wakeup()
111247
* Fixed an issue where redirect on the current page was not working in certain conditions
112248
* Fixed an issue where first store could not be selected on frontend
113249
* Fixed an issue with performance toolkit category creation
114250
* Fixed an issue when columns 'Interval', 'Price Rule' had incorrect values in Coupon Usage report
115251
* Fixed an issue where fatal error occurred on Abandoned Carts report grid
116252
* Fixed an issue where it was not possible to add product to shopping cart if Use Secure URLs in Frontend = Yes
117-
* Fixed an issue where email was not required during Guest Checkout
253+
* Fixed an issue where email was not required during Guest Checkout
118254
* Fixed broken ability to skip reindex in `bin/magento setup:performance:generate-fixtures` command
119255
* Fixed an issue where `bin/magento indexer:reindex` command failed after `bin/magento setup:di:compile` was run
120256
* Fixed bug with broken JS i18n
@@ -434,7 +570,7 @@
434570
* The page and block data and repository interfaces
435571
* Updated the public API list
436572
* Framework improvements
437-
* Improved the profile generator
573+
* Improved the profile generator
438574
* Introduced the new environment for Jasmine tests
439575
* Design
440576
* Inverted the new admin area styles scope, clean up the old styles

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=master)](https://travis-ci.org/magento/magento2)
2+
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
23
<h2>Welcome</h2>
34
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
45

app/code/Magento/AdminNotification/Block/Window.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ protected function _toHtml()
7676
if ($this->canShow()) {
7777
$this->setHeaderText($this->escapeHtml(__('Incoming Message')));
7878
$this->setCloseText($this->escapeHtml(__('close')));
79-
$this->setReadDetailsText($this->escapeHtml(__('Read details')));
79+
$this->setReadDetailsText($this->escapeHtml(__('Read Details')));
8080
$this->setNoticeMessageText($this->escapeHtml($this->_getLatestItem()->getTitle()));
8181
$this->setNoticeMessageUrl($this->escapeUrl($this->_getLatestItem()->getUrl()));
8282
$this->setSeverityText('critical');

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,6 @@ class Notification extends \Magento\Backend\App\AbstractAction
1414
*/
1515
protected function _isAllowed()
1616
{
17-
switch ($this->getRequest()->getActionName()) {
18-
case 'markAsRead':
19-
$acl = 'Magento_AdminNotification::mark_as_read';
20-
break;
21-
22-
case 'massMarkAsRead':
23-
$acl = 'Magento_AdminNotification::mark_as_read';
24-
break;
25-
26-
case 'remove':
27-
$acl = 'Magento_AdminNotification::adminnotification_remove';
28-
break;
29-
30-
case 'massRemove':
31-
$acl = 'Magento_AdminNotification::adminnotification_remove';
32-
break;
33-
34-
default:
35-
$acl = 'Magento_AdminNotification::show_list';
36-
}
37-
return $this->_authorization->isAllowed($acl);
17+
return $this->_authorization->isAllowed('Magento_AdminNotification::show_list');
3818
}
3919
}

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,12 @@ public function execute()
3636
}
3737
$this->_redirect('adminhtml/*/');
3838
}
39+
40+
/**
41+
* @return bool
42+
*/
43+
protected function _isAllowed()
44+
{
45+
return $this->_authorization->isAllowed('Magento_AdminNotification::mark_as_read');
46+
}
3947
}

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,12 @@ public function execute()
3838
}
3939
$this->_redirect('adminhtml/*/');
4040
}
41+
42+
/**
43+
* @return bool
44+
*/
45+
protected function _isAllowed()
46+
{
47+
return $this->_authorization->isAllowed('Magento_AdminNotification::mark_as_read');
48+
}
4149
}

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,12 @@ public function execute()
3333
}
3434
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
3535
}
36+
37+
/**
38+
* @return bool
39+
*/
40+
protected function _isAllowed()
41+
{
42+
return $this->_authorization->isAllowed('Magento_AdminNotification::adminnotification_remove');
43+
}
3644
}

0 commit comments

Comments
 (0)