Skip to content

Commit

Permalink
Develop -> Master (#848)
Browse files Browse the repository at this point in the history
* Merged @adgrace pull request #410

* Merged @adgrace pull request #410

* Bugfix: zone country is detected incorrect if link is used

* Bugfix: zone country is detected incorrect if link is used

* Decrease build size

* Order zones by name

* Updated 2019c files

* Updated changelog

* Resolve es6 loading issue where moment is undefined

* Removed node 4 and 6 from travis.yml

* Corrected version numbers (#845)

Version numbers were incorrect so fixed it.

* Fixed changelog to represent proper release versions (#839)

* Fixed changelog to represent proper release versions

* Removed node v4 and 6 from travis build, because as pointed by other the ES6 syntax now included in the lib aren't supported with those earlier node versions.

Co-authored-by: Alexandre Couillard <[email protected]>

* Resolves es6 module loading issue

* Corrected version numbers (#845)

Version numbers were incorrect so fixed it.

* Resolves es6 module loading issue

Co-authored-by: Brinley Ang <[email protected]>
Co-authored-by: praneeth-m <[email protected]>
Co-authored-by: Jackalex36 <[email protected]>
Co-authored-by: Alexandre Couillard <[email protected]>
  • Loading branch information
5 people authored May 16, 2020
1 parent a04803a commit 286646c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
### `0.5.29` _2020-02-21_
### `0.5.28` _2020-02-21_
Merged pull request #410 from @adgrace:
* Added a method `moment.tz.zonesForCountry(country_code)` which returns all timezones for the country
* Added a method `moment.tz(timezone_id).countries()` to get countries for some time zone
* Added a method `moment.tz.countries()` to get all country codes
* And as you know `moment.tz.zones()` already exists

### `0.5.28` _2019-10-14_
### `0.5.27` _2019-10-14_
* Updated data to IANA TZDB `2019c`

### `0.5.26` _2019-06-06_
Expand Down
2 changes: 1 addition & 1 deletion moment-timezone.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"use strict";

// Resolves es6 module loading issue
if (moment.version === undefined) {
if (moment.version === undefined && moment.default) {
moment = moment.default;
}

Expand Down

0 comments on commit 286646c

Please sign in to comment.