Merge branch '1.9.4' of tasktools.org:task into 1.9.4

This commit is contained in:
Paul Beckingham 2011-01-29 17:20:34 -05:00
commit 5f8858856b
3 changed files with 4 additions and 3 deletions

3
NEWS
View file

@ -15,8 +15,9 @@ New Features in taskwarrior 1.9.4
any other report, but returns unformatted JSON. any other report, but returns unformatted JSON.
- Import can now read from files and URLs. - Import can now read from files and URLs.
- Assorted bug fixes. - Assorted bug fixes.
- new worded date "later" and "someday" to be used with the wait attribute to - New literal date "later" and "someday" to be used with the wait attribute to
hide a task until somepoint in time (this sets the wait date to 1/18/2038). hide a task until somepoint in time (this sets the wait date to 1/18/2038).
- Total active time now shown on the info report.
Please refer to the ChangeLog file for full details. There are too many to Please refer to the ChangeLog file for full details. There are too many to
list here. list here.

View file

@ -271,7 +271,7 @@ Shows all tasks matching the filter that are started but not completed.
.TP .TP
.B all [filter] .B all [filter]
Shows all tasks matching the filter. Shows all tasks matching the filter, including parents of recurring tasks.
.TP .TP
.B completed [filter] .B completed [filter]

View file

@ -401,7 +401,7 @@ std::string Config::defaults =
"#report.waiting.annotations=full\n" "#report.waiting.annotations=full\n"
"\n" "\n"
"# task all\n" "# task all\n"
"report.all.description=Lists all tasks matching the specified criteria\n" "report.all.description=Lists all tasks matching the specified criteria, including parents of recurring tasks\n"
"report.all.columns=id,project,priority,due,end,active,age,description\n" "report.all.columns=id,project,priority,due,end,active,age,description\n"
"report.all.labels=ID,Project,Pri,Due,Completed,Active,Age,Description\n" "report.all.labels=ID,Project,Pri,Due,Completed,Active,Age,Description\n"
"report.all.sort=project+,due+,end+,priority-,active-,description+\n" "report.all.sort=project+,due+,end+,priority-,active-,description+\n"