Merge remote-tracking branch 'origin/develop' into MAGETWO-62410 (3bf1917b) · 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
3bf1917b

Commit 3bf1917b authored 8 years ago by

Olga Matviienko

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into MAGETWO-62410

parents 294a6b98 813fad85

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Ui/view/base/web/js/form/element/date.js 4 additions, 20 deletions

app/code/Magento/Ui/view/base/web/js/form/element/date.js
app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/datepicker.js 1 addition, 1 deletion

...o/Ui/view/base/web/js/lib/knockout/bindings/datepicker.js
dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js 4 additions, 631 deletions

...sts/app/code/Magento/Ui/base/js/form/element/date.test.js
dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/datepicker.test.js 22 additions, 15 deletions

...pp/code/Magento/Ui/base/js/lib/ko/bind/datepicker.test.js
dev/tests/js/jasmine/tests/lib/mage/misc.test.js 638 additions, 0 deletions

dev/tests/js/jasmine/tests/lib/mage/misc.test.js
lib/web/mage/utils/misc.js 16 additions, 0 deletions

lib/web/mage/utils/misc.js

with 685 additions and 667 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