Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-57697 (b3271325) · Commits · KIII-12 / Magento · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

Magento
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

KIII-12
Magento
Commits
b3271325

Commit b3271325 authored 8 years ago by

Andrii Dimov

Downloads
- Plain Diff

Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-57697

parents c396683e b65ac0b4

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php 6 additions, 0 deletions

...o/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php 4 additions, 1 deletion

...nto/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
app/code/Magento/CatalogImportExport/Model/Export/Product.php 18 additions, 1 deletion

...code/Magento/CatalogImportExport/Model/Export/Product.php
dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php 29 additions, 2 deletions

.../Magento/CatalogImportExport/Model/Export/ProductTest.php
dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_categories.php 9 additions, 0 deletions

...logImportExport/_files/product_export_with_categories.php
lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js 2 additions, 0 deletions

lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js

with 68 additions and 4 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment