Skip to content

Commit 7c33ccb

Browse files
author
Andreas Müller
committed
Merge branch 'develop'
# Conflicts: # package-lock.json # package.json # src/gtt-edit.js
2 parents 862a38c + cb50e26 commit 7c33ccb

File tree

2 files changed

+14
-39
lines changed

2 files changed

+14
-39
lines changed

package-lock.json

Lines changed: 12 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/gtt-edit.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ if (!id) {
4949
}${column(frame.title != null ? frame.title : "", 50)}`;
5050
return {
5151
name:
52-
` ${frame.id} ${frame.start.clone().format("MMMM Do YYYY HH:mm").green} to ${
53-
frame.stop.clone().format("HH:mm").green
52+
` ${frame.id} ${frame.start.clone().format("MMMM Do YYYY HH:mm").green} ${
53+
frame.stop ? "to" + frame.stop.clone().format("HH:mm").green : "(running)"
5454
}\t${durationText}` +
5555
`${column(frame.project, 50).magenta}${issue}${
5656
frame.note != null ? frame.note : ""

0 commit comments

Comments
 (0)