diff --git a/CHANGELOG.md b/CHANGELOG.md index fdc1db2..90ad927 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 1.1.0 - 2017-09-28 +- Add additional typeof check for the global.moment instance ([#295](https://github.com/urish/angular-moment/pull/295), contributed by [schester44](https://github.com/schester44)) + ## 1.0.1 - 2016-12-01 - Angular 1.6 support ([#278](https://github.com/urish/angular-moment/pull/278), contributed by [alippai](https://github.com/alippai)) diff --git a/README.md b/README.md index bfb2a8a..421d9a9 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ angular-moment AngularJS directive and filters for [Moment.JS](http://www.momentjs.com). -Copyright (C) 2013, 2014, 2015, 2016, Uri Shaked +Copyright (C) 2013, 2014, 2015, 2016, 2017, Uri Shaked [![Build Status](https://travis-ci.org/urish/angular-moment.png?branch=master)](https://travis-ci.org/urish/angular-moment) [![Coverage Status](https://coveralls.io/repos/urish/angular-moment/badge.png)](https://coveralls.io/r/urish/angular-moment) @@ -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.1/angular-moment.min.js) or [CDNJS](https://cdnjs.cloudflare.com/ajax/libs/angular-moment/1.0.1/angular-moment.min.js) +* From a CDN: [jsDelivr](https://cdn.jsdelivr.net/angular.moment/1.1.0/angular-moment.min.js) or [CDNJS](https://cdnjs.cloudflare.com/ajax/libs/angular-moment/1.1.0/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 df28b15..38a2cec 100644 --- a/angular-moment.js +++ b/angular-moment.js @@ -1,4 +1,4 @@ -/* angular-moment.js / v1.0.1 / (c) 2013, 2014, 2015, 2016 Uri Shaked / MIT Licence */ +/* angular-moment.js / v1.1.0 / (c) 2013, 2014, 2015, 2016, 2017 Uri Shaked / MIT Licence */ 'format amd'; /* global define */ diff --git a/angular-moment.nuspec b/angular-moment.nuspec index 657cf8f..0259220 100644 --- a/angular-moment.nuspec +++ b/angular-moment.nuspec @@ -2,7 +2,7 @@ angular-moment - 1.0.1 + 1.1.0 Angular Moment urish https://github.com/urish/angular-moment diff --git a/package.json b/package.json index 73b3a4e..471895c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-moment", - "version": "1.0.1", + "version": "1.1.0", "main": "angular-moment.js", "repository": { "type": "git",