Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop -> Master release 0.5.29 #849

Merged
merged 20 commits into from
May 16, 2020
Merged

Develop -> Master release 0.5.29 #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
786b531
Merged @adgrace pull request #410
ellenaua Feb 19, 2020
9577cd0
Merged @adgrace pull request #410
ellenaua Feb 19, 2020
430fa36
Bugfix: zone country is detected incorrect if link is used
ellenaua Feb 20, 2020
6e68c6b
Bugfix: zone country is detected incorrect if link is used
ellenaua Feb 20, 2020
043d3d5
Decrease build size
ellenaua Feb 20, 2020
b82473c
Order zones by name
ellenaua Feb 20, 2020
dc49a03
Updated 2019c files
ellenaua Feb 21, 2020
d7f687e
Updated changelog
ellenaua Feb 21, 2020
0296382
Resolve es6 loading issue where moment is undefined
brinley Apr 6, 2017
ff7864f
Removed node 4 and 6 from travis.yml
ellenaua May 16, 2020
cabe132
Corrected version numbers (#845)
praneeth-m May 16, 2020
1cf8dd2
Fixed changelog to represent proper release versions (#839)
Beatboxace May 16, 2020
1fd4234
Resolves es6 module loading issue
ellenaua May 16, 2020
adb7d7b
Corrected version numbers (#845)
praneeth-m May 16, 2020
778c22f
Resolves es6 module loading issue
ellenaua May 16, 2020
d50bf27
Merge branch 'develop' of https://github.com/moment/moment-timezone i…
ellenaua May 16, 2020
ed529ea
Yet another PR adding TypeScript declarations (#530)
cspotcode May 16, 2020
7045244
Release 0.5.29
ellenaua May 16, 2020
cb0b4a9
Release 0.5.29
ellenaua May 16, 2020
94916b2
Merge branch 'master' into develop
ellenaua May 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ module.exports = function(grunt) {

clean: {
data: ['temp']
},

exec: {
'typing-tests': './node_modules/.bin/tsc --project ./typing-tests'
}
});

Expand All @@ -54,11 +58,13 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-exec');

grunt.registerTask('release', ['jshint', 'data', 'nodeunit', 'typing-tests', 'build', 'uglify']);

/** creates a release */
grunt.registerTask('release', ['jshint', 'data', 'nodeunit', 'build', 'uglify']);
grunt.registerTask('releaseNoData', ['jshint', 'nodeunit', 'typing-tests', 'build', 'uglify']);

grunt.registerTask('releaseNoData', ['jshint', 'nodeunit', 'build', 'uglify']);
grunt.registerTask('typing-tests', ['exec:typing-tests']);

grunt.registerTask('default', ['jshint', 'nodeunit']);
grunt.registerTask('default', ['jshint', 'nodeunit', 'typing-tests']);
};
9 changes: 7 additions & 2 deletions builds/moment-timezone-with-data-10-year-range.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//! moment-timezone.js
//! version : 0.5.28
//! version : 0.5.29
//! Copyright (c) JS Foundation and other contributors
//! license : MIT
//! github.com/moment/moment-timezone
Expand All @@ -18,13 +18,18 @@
}(this, function (moment) {
"use strict";

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

// Do not load moment-timezone a second time.
// if (moment.tz !== undefined) {
// logError('Moment Timezone ' + moment.tz.version + ' was already loaded ' + (moment.tz.dataVersion ? 'with data from ' : 'without any data') + moment.tz.dataVersion);
// return moment;
// }

var VERSION = "0.5.28",
var VERSION = "0.5.29",
zones = {},
links = {},
countries = {},
Expand Down
2 changes: 1 addition & 1 deletion builds/moment-timezone-with-data-10-year-range.min.js
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions builds/moment-timezone-with-data-1970-2030.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//! moment-timezone.js
//! version : 0.5.28
//! version : 0.5.29
//! Copyright (c) JS Foundation and other contributors
//! license : MIT
//! github.com/moment/moment-timezone
Expand All @@ -18,13 +18,18 @@
}(this, function (moment) {
"use strict";

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

// Do not load moment-timezone a second time.
// if (moment.tz !== undefined) {
// logError('Moment Timezone ' + moment.tz.version + ' was already loaded ' + (moment.tz.dataVersion ? 'with data from ' : 'without any data') + moment.tz.dataVersion);
// return moment;
// }

var VERSION = "0.5.28",
var VERSION = "0.5.29",
zones = {},
links = {},
countries = {},
Expand Down
2 changes: 1 addition & 1 deletion builds/moment-timezone-with-data-1970-2030.min.js
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions builds/moment-timezone-with-data-2012-2022.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//! moment-timezone.js
//! version : 0.5.28
//! version : 0.5.29
//! Copyright (c) JS Foundation and other contributors
//! license : MIT
//! github.com/moment/moment-timezone
Expand All @@ -18,13 +18,18 @@
}(this, function (moment) {
"use strict";

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

// Do not load moment-timezone a second time.
// if (moment.tz !== undefined) {
// logError('Moment Timezone ' + moment.tz.version + ' was already loaded ' + (moment.tz.dataVersion ? 'with data from ' : 'without any data') + moment.tz.dataVersion);
// return moment;
// }

var VERSION = "0.5.28",
var VERSION = "0.5.29",
zones = {},
links = {},
countries = {},
Expand Down
2 changes: 1 addition & 1 deletion builds/moment-timezone-with-data-2012-2022.min.js
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions builds/moment-timezone-with-data.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion builds/moment-timezone-with-data.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/moment-timezone.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### `0.5.29` _2020-05-16_
* Merged fix of es6 module loading issue https://github.com/moment/moment-timezone/commit/1fd42349189b24e15c60f162dc8c40b42db79dfe
* Merged PR with typescript declarations https://github.com/moment/moment-timezone/commit/ed529ea6fbcc70315c0c3f6d7c7cb70eadf56b03
* Merged fixes to changelog https://github.com/moment/moment-timezone/commit/adb7d7b43c7328d814311ac1355bfeef88eab6e8

### `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
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "moment/moment-timezone",
"description": "Parse and display dates in any timezone",
"version": "0.5.28",
"version": "0.5.29",
"keywords": [
"moment",
"date",
Expand Down
Loading