diff --git a/CHANGELOG.md b/CHANGELOG.md index e70ed82..fce373b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ # Changelog -## 1.0.0-beta.6 - TBD +## 1.0.0-beta.6 - 2016-04-24 - Support for setting the units of the full date threshold of `am-time-ago` ([#237](https://github.com/urish/angular-moment/pull/237), contributed by [denistrustepain](https://github.com/denistrustepain)) - Add optional arguments `referenceTime` and `formats` to the `amCalendar` filter ([#241](https://github.com/urish/angular-moment/pull/241), contributed by [Nitro-N](https://github.com/Nitro-N)) +- Support moment 2.13.x and above ## 1.0.0-beta.5 - 2016-03-18 - Bugfix: `amTimeAgo` shouldn't convert the time to local timezone on the element's `title` attribute ([#226](https://github.com/urish/angular-moment/pull/226), contributed by [stackia](https://github.com/stackia)) diff --git a/README.md b/README.md index 3b504d4..374a585 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ You can choose your preferred method of installation: * Through bower: `bower install angular-moment --save` * Through npm: `npm install angular-moment moment --save` * Through NuGet: `Install-Package angular-moment Moment.js` -* From a CDN: [jsDelivr](https://cdn.jsdelivr.net/angular.moment/1.0.0-beta.5/angular-moment.min.js) or [CDNJS](https://cdnjs.cloudflare.com/ajax/libs/angular-moment/1.0.0-beta.5/angular-moment.min.js) +* From a CDN: [jsDelivr](https://cdn.jsdelivr.net/angular.moment/1.0.0-beta.6/angular-moment.min.js) or [CDNJS](https://cdnjs.cloudflare.com/ajax/libs/angular-moment/1.0.0-beta.6/angular-moment.min.js) * Download from github: [angular-moment.min.js](https://raw.github.com/urish/angular-moment/master/angular-moment.min.js) diff --git a/angular-moment.js b/angular-moment.js index e38f879..d7fed90 100644 --- a/angular-moment.js +++ b/angular-moment.js @@ -1,4 +1,4 @@ -/* angular-moment.js / v1.0.0-beta.5 / (c) 2013, 2014, 2015, 2016 Uri Shaked / MIT Licence */ +/* angular-moment.js / v1.0.0-beta.6 / (c) 2013, 2014, 2015, 2016 Uri Shaked / MIT Licence */ 'format amd'; /* global define */ diff --git a/angular-moment.nuspec b/angular-moment.nuspec index 6b3dcef..4642679 100644 --- a/angular-moment.nuspec +++ b/angular-moment.nuspec @@ -2,7 +2,7 @@ angular-moment - 1.0.0-beta5 + 1.0.0-beta6 Angular Moment urish https://github.com/urish/angular-moment diff --git a/bower.json b/bower.json index 6c0ab14..6202230 100644 --- a/bower.json +++ b/bower.json @@ -9,7 +9,7 @@ ], "dependencies": { "angular": ">=1.2.0 <1.6.0", - "moment": ">=2.8.0 <2.13.0" + "moment": ">=2.8.0 <3.0.0" }, "devDependencies": { "angular-mocks": "1.4.x", diff --git a/package.json b/package.json index 5605f4c..fb9e92a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-moment", - "version": "1.0.0-beta.5", + "version": "1.0.0-beta.6", "main": "angular-moment.js", "repository": { "type": "git", @@ -15,7 +15,7 @@ "LICENSE" ], "dependencies": { - "moment": ">=2.8.0 <2.13.0" + "moment": ">=2.8.0 <3.0.0" }, "devDependencies": { "bower": "1.7.9",