Skip to main content

Primary navigation

Project

Magento
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

KIII-12
Magento
Commits
c3652ca0

Commit c3652ca0 authored Dec 15, 2016 by Oleksandr Miroshnichenko

Downloads
- Plain Diff

Merge branch 'develop' of github.com:magento-folks/magento2ce into bugs

parents b9158165 8d4d0c02

Branches

Tags

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Ui/Component/Form/Element/DataType/Date.php 2 additions, 1 deletion

app/code/Magento/Ui/Component/Form/Element/DataType/Date.php
app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php 2 additions, 5 deletions

...Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php
app/code/Magento/Ui/view/base/web/js/form/element/date.js 26 additions, 2 deletions

app/code/Magento/Ui/view/base/web/js/form/element/date.js
dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js 637 additions, 2 deletions

...sts/app/code/Magento/Ui/base/js/form/element/date.test.js
dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt 0 additions, 1 deletion

...ic/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
lib/internal/Magento/Framework/HTTP/Adapter/Curl.php 1 addition, 2 deletions

lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
lib/internal/Magento/Framework/HTTP/Client/Curl.php 4 additions, 4 deletions

lib/internal/Magento/Framework/HTTP/Client/Curl.php

with 672 additions and 17 deletions

Loading

0% Loading or .

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

Finish editing this message first!

Please sign in to comment