github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Lock json-loader, moment-timezone packages. Change default timezone to Browser.

Browse source
This commit is contained in:
Jonathan Budzenski 2015-10-20 07:18:24 -05:00
parent 95714696fb
commit bff870e915
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -108,7 +108,7 @@
"minimatch": "2.0.10",
"mkdirp": "0.5.1",
"moment": "2.10.6",
"moment-timezone": "^0.4.1",
"moment-timezone": "0.4.1",
"raw-loader": "0.5.1",
"request": "2.61.0",
"requirefrom": "0.2.0",
@ -148,7 +148,7 @@
"html-entities": "1.1.3",
"husky": "0.8.1",
"istanbul-instrumenter-loader": "0.1.3",
"json-loader": "^0.5.3",
"json-loader": "0.5.3",
"karma": "0.13.9",
"karma-chrome-launcher": "0.2.0",
"karma-coverage": "0.5.1",

6
src/ui/public/config/defaults.js
View file

@ -24,10 +24,10 @@ define(function (require) {
description: 'When displaying a pretty formatted date, use this format',
},
'dateFormat:tz': {
value: 'Default',
description: 'Which timezone should be used. "Default" will use your detected timezone.',
value: 'Browser',
description: 'Which timezone should be used. "Browser" will use the timezone detected by your browser.',
type: 'select',
options: _.union(['Default'], moment.tz.names())
options: _.union(['Browser'], moment.tz.names())
},
'dateFormat:scaled': {
type: 'json',