Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
299053f2
Commit
299053f2
authored
Aug 19, 2014
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for utc in timepicker, Closes #713
parent
a64604de
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
src/app/panels/timepicker/module.js
+2
-2
src/vendor/moment.js
+0
-0
No files found.
src/app/panels/timepicker/module.js
View file @
299053f2
...
@@ -193,8 +193,8 @@ function (angular, app, _, moment, kbn) {
...
@@ -193,8 +193,8 @@ function (angular, app, _, moment, kbn) {
moment
(
model
.
to
.
date
).
fromNow
();
moment
(
model
.
to
.
date
).
fromNow
();
}
}
else
{
else
{
model
.
rangeString
=
$scope
.
dashboard
.
formatDate
(
model
.
from
.
date
,
'MMM D, YYYY
hh
:mm:ss'
)
+
' to '
+
model
.
rangeString
=
$scope
.
dashboard
.
formatDate
(
model
.
from
.
date
,
'MMM D, YYYY
HH
:mm:ss'
)
+
' to '
+
$scope
.
dashboard
.
formatDate
(
model
.
to
.
date
,
'MMM D, YYYY
hh
:mm:ss'
);
$scope
.
dashboard
.
formatDate
(
model
.
to
.
date
,
'MMM D, YYYY
HH
:mm:ss'
);
}
}
}
}
...
...
src/vendor/moment.js
View file @
299053f2
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment