Merge branch 'master' into 1.8.0

Conflicts:
	html/task.html
This commit is contained in:
Paul Beckingham 2009-05-28 11:36:21 -04:00
commit dc52e096ba

View file

@ -306,8 +306,10 @@ Lists all task, all data, matching the specified criteria
.B
report.long.labels=ID,Project,Pri,Added,Started,Due,Recur,Age,Tags,Description
.RE
.br
.B
report.long.columns=id,project,priority,entry,start,due,recur,age,tags,description
.br
.B
report.long.sort=due+,priority-,project+
@ -320,8 +322,10 @@ Lists all tasks matching the specified criteria
.B
report.list.labels=ID,Project,Pri,Due,Active,Age,Description
.RE
.br
.B
report.list.columns=id,project,priority,due,active,age,description
.br
.B
report.list.sort=due+,priority-,project+
@ -335,8 +339,10 @@ Minimal listing of all tasks matching the specified criteria
.B
report.ls.labels=ID,Project,Pri,Description
.RE
.br
.B
report.ls.columns=id,project,priority,description
.br
.B
report.ls.sort=priority-,project+
@ -349,10 +355,13 @@ Shows the newest tasks
.B
report.newest.labels=ID,Project,Pri,Due,Active,Age,Description
.RE
.br
.B
report.newest.columns=id,project,priority,due,active,age,description
.br
.B
report.newest.sort=id-
.br
.B
report.newest.limit=10
@ -366,10 +375,13 @@ Shows the oldest tasks
.B
report.oldest.labels=ID,Project,Pri,Due,Active,Age,Description
.RE
.br
.B
report.oldest.columns=id,project,priority,due,active,age,description
.br
.B
report.oldest.sort=id+
.br
.B
report.oldest.limit=10