Skip to content
This repository has been archived by the owner on Nov 30, 2021. It is now read-only.

Commit

Permalink
doc(am-time-ago): improve documentation for `amTimeAgoConfig.serverTi…
Browse files Browse the repository at this point in the history
…me` (#53)
  • Loading branch information
urish committed Jul 27, 2014
1 parent 381ddc6 commit e18e82a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
- Generate source map for the minified version ([#50](https://github.com/urish/angular-moment/issues/50))
- Add support HTML `<time>` element - set the `datetime` attribute ([#41](https://github.com/urish/angular-moment/pull/41), contributed by [gsklee](https://github.com/gsklee))
- Add default format (angularMomentConfig.format config property) ([#52](https://github.com/urish/angular-moment/pull/52), contributed by [otang](https://github.com/otang))
- #53 (TBD)
- Add `serverTime` configuration option ([#54](https://github.com/urish/angular-moment/pull/54), contributed by [Ephi Gabay](https://github.com/ephigabay))
- Add `serverTime` configuration option ([#53](https://github.com/urish/angular-moment/pull/53), contributed by Facundo Pedrazzini)
- #54 ([#54](https://github.com/urish/angular-moment/pull/54), contributed by [Ephi Gabay](https://github.com/ephigabay))
- Support moment.js v2.7.0. See [here](https://gist.github.com/ichernev/b0a3d456d5a84c9901d7) for changelog.
- Support moment-timezone v0.1.0. See [here](https://github.com/moment/moment-timezone/blob/develop/changelog.md#010-2014-06-23) for changelog.

Expand Down
6 changes: 3 additions & 3 deletions angular-moment.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@
* @ngdoc property
* @name angularMoment.config.amTimeAgoConfig#serverTime
* @propertyOf angularMoment.config:amTimeAgoConfig
* @returns {numeric} Date in milliseconds.
* @returns {number} Server time in milliseconds since the epoch
*
* @description
* When you need to use the time of your server.
* Defaults to null. Local time will be used.
* If set, time ago will be calculated relative to the given value.
* If null, local time will be used. Defaults to null.
*/
serverTime: null
})
Expand Down

0 comments on commit e18e82a

Please sign in to comment.