Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add UI to delete tracked times #14100

Merged
merged 40 commits into from
Feb 19, 2021
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
99d977f
add DeleteTime issue action
noerw Dec 21, 2020
864651a
store time ID for CommentTypeAddTimeManual & StopTracking
noerw Dec 21, 2020
083bb1e
add template to render delete time button on comments
noerw Dec 21, 2020
a322b60
code review
noerw Dec 22, 2020
0ee2dce
make linter happy
noerw Dec 22, 2020
0bfc614
Update routers/repo/issue_timetrack.go
noerw Dec 22, 2020
3cab4a8
Update routers/repo/issue_timetrack.go
noerw Dec 22, 2020
ba50f18
Merge branch 'master' into delete-times-ui
6543 Dec 22, 2020
7470f8a
add confirmation dialog
noerw Dec 22, 2020
78f4b2c
revert vscode shenanigans
noerw Dec 22, 2020
dd0a7d7
make linter happy
noerw Dec 22, 2020
6a37c2f
(╯°□°)╯︵ ┻━┻
noerw Dec 22, 2020
3548da4
Merge branch 'master' into delete-times-ui
6543 Dec 22, 2020
7d2f0d3
Add migration
6543 Dec 22, 2020
c8e6271
Merge branch 'master' into delete-times-ui
noerw Dec 24, 2020
d360901
rename to comments_delete_time template
noerw Dec 24, 2020
e0a11f4
rectangular button
noerw Dec 24, 2020
c97d667
submit add time on enter
noerw Dec 24, 2020
0bd16c9
revert -> Revert Time Log
noerw Dec 24, 2020
acf5a84
Merge branch 'master' into delete-times-ui
6543 Dec 27, 2020
209304e
revert -> delete, trashcan icon
noerw Jan 10, 2021
b655885
move migration for curr master
noerw Jan 10, 2021
1f6f28a
Merge remote-tracking branch 'origin/master' into delete-times-ui
noerw Jan 10, 2021
432127b
Merge remote-tracking branch 'noerw/delete-times-ui' into delete-time…
noerw Jan 10, 2021
12ba398
Merge remote-tracking branch 'origin/master' into delete-times-ui
noerw Jan 12, 2021
c0396e5
fixup! Merge remote-tracking branch 'origin/master' into delete-times-ui
noerw Jan 12, 2021
d35eb22
fixup! Merge remote-tracking branch 'origin/master' into delete-times-ui
noerw Jan 12, 2021
a1260a3
Merge remote-tracking branch 'origin/master' into delete-times-ui
noerw Jan 13, 2021
f2c8542
Merge branch 'master' into delete-times-ui
noerw Jan 16, 2021
498f15f
Merge branch 'master' into delete-times-ui
6543 Jan 19, 2021
18d62ef
Merge branch 'master' into delete-times-ui
6543 Jan 23, 2021
a2b0b66
Merge branch 'master' into delete-times-ui
6543 Feb 4, 2021
2041c93
migrate to chi
6543 Feb 4, 2021
0955919
Merge branch 'master' into delete-times-ui
6543 Feb 9, 2021
fbf4a1d
add
6543 Feb 12, 2021
4543349
Merge branch 'master' into delete-times-ui
6543 Feb 12, 2021
040cea4
Merge branch 'master' into delete-times-ui
6543 Feb 15, 2021
bc0fc82
Merge branch 'master' into delete-times-ui
6543 Feb 19, 2021
2a2dd93
Flash Success
6543 Feb 19, 2021
574fad2
imports
6543 Feb 19, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into delete-times-ui
  • Loading branch information
noerw committed Jan 10, 2021
commit 1f6f28a3491d12efd5fdece5ba35b349d93ad361
6 changes: 6 additions & 0 deletions models/migrations/migrations.go
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,12 @@ var migrations = []Migration{
NewMigration("Convert task type from int to string", convertTaskTypeToString),
// v162 -> v163
NewMigration("Convert webhook task type from int to string", convertWebhookTaskTypeToString),
// v163 -> v164
NewMigration("Convert topic name from 25 to 50", convertTopicNameFrom25To50),
// v164 -> v165
NewMigration("Add scope and nonce columns to oauth2_grant table", addScopeAndNonceColumnsToOAuth2Grant),
// v165 -> v166
NewMigration("Convert hook task type from char(16) to varchar(16) and trim the column", convertHookTaskTypeToVarcharAndTrim),
// v166 -> v167
NewMigration("Add time_id column to Comment", addTimeIDCommentColumn),
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.