From 539079122418c485347506110bef232c99a75d37 Mon Sep 17 00:00:00 2001 From: Lanre Adelowo Date: Tue, 5 Feb 2019 12:38:11 +0100 Subject: 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 --- options/locale/locale_en-US.ini | 1 + 1 file changed, 1 insertion(+) (limited to 'options') 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 issue!` issues.stop_tracking = Stop issues.stop_tracking_history = `stopped working %s` -- cgit v1.2.3