Merge pull request #17814 from owncloud/update-moment-js

update moment.js to 2.10.3
This commit is contained in:
Robin McCorkell 2015-07-29 22:10:16 +01:00
commit 0fcb9f79cc
5 changed files with 4205 additions and 3620 deletions

View File

@ -20,7 +20,7 @@
"jquery-migrate": "~1.2.1",
"jquery-ui": "1.10.0",
"jsTimezoneDetect": "~1.0.5",
"moment": "~2.8.3",
"moment": "~2.10.0",
"select2": "~3.4.8",
"zxcvbn": "*",
"snapjs": "~2.0.0-rc1",

View File

@ -30,6 +30,7 @@ moment/locale
moment/min/**
moment/moment.js
moment/scripts
moment/templates
!moment/min/moment-with-locales.js
# jquery

View File

@ -1,30 +1,33 @@
{
"name": "moment",
"version": "2.8.4",
"version": "2.10.3",
"main": "moment.js",
"ignore": [
"**/.*",
"node_modules",
"benchmarks",
"bower_components",
"test",
"tests",
"meteor",
"node_modules",
"scripts",
"tasks",
"test",
"component.json",
"composer.json",
"CONTRIBUTING.md",
"ender.js",
"Gruntfile.js",
"Moment.js.nuspec",
"package.js",
"package.json"
],
"homepage": "https://github.com/moment/moment",
"_release": "2.8.4",
"_release": "2.10.3",
"_resolution": {
"type": "version",
"tag": "2.8.4",
"commit": "7ae59de2fc3a1298ae829f6369fe3589b2cd87f8"
"tag": "2.10.3",
"commit": "6fa444238494318e3c488c81d8520ad2eba8bae7"
},
"_source": "git://github.com/moment/moment.git",
"_target": "~2.8.3",
"_target": "~2.10.0",
"_originalSource": "moment"
}

View File

@ -1,4 +1,4 @@
Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors
Copyright (c) 2011-2015 Tim Wood, Iskren Chernev, Moment.js contributors
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation

File diff suppressed because it is too large Load Diff