diff options
| author | Lanre Adelowo <adelowomailbox@gmail.com> | 2019-02-05 12:38:11 +0100 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-02-05 13:38:11 +0200 |
| commit | 539079122418c485347506110bef232c99a75d37 (patch) | |
| tree | a00aa1ae7a7bb0e82dcae461b7c53c3921731cb2 /options | |
| parent | 5bd594c85883d713f9d94f6e93cd8f08b253b369 (diff) | |
| download | gitea-539079122418c485347506110bef232c99a75d37.tar.gz gitea-539079122418c485347506110bef232c99a75d37.zip | |
Automatically clear stopwatch on merging a PR (#4327)
* Don't display buttons if there are no notices
* clear stopwatch on merging a PR
* remove redundant gt check
* use ctx.Flash as per @bkcsoft comment
* stop timer on closing issues/PRs too
* updated translation as per review
* redirect to login page after successfully activating account
* remove unrelated changes
* stop timer for issues that are closed via commits too..Not just the 'close' UI button
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2d32fac9c7..502b980c43 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -781,6 +781,7 @@ issues.tracker = Time Tracker issues.start_tracking_short = Start issues.start_tracking = Start Time Tracking issues.start_tracking_history = `started working %s` +issues.tracker_auto_close = Timer will be stopped automatically when this issue gets closed issues.tracking_already_started = `You have already started time tracking on this <a href="%s">issue</a>!` issues.stop_tracking = Stop issues.stop_tracking_history = `stopped working %s` |