diff --git a/ChangeLog b/ChangeLog index 9d05c1173..6a0099656 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ 2.2.0 () - Features + + Added Feature #685, which provides a 'blocking' report, and new color rule + (thanks to Michelle Crane). + Added Feature #1069, which gives a clearer error when a UDA is added without the uda..type variable. + The 'projects' command now outputs abstract parents and reduces diff --git a/src/Config.cpp b/src/Config.cpp index 236ce3445..2644477fd 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -349,7 +349,7 @@ std::string Config::_defaults = "report.overdue.columns=id,project,priority,due,start.active,entry.age,description\n" "report.overdue.labels=ID,Project,Pri,Due,Active,Age,Description\n" "report.overdue.sort=due+,priority-,start-,project+\n" - "report.overdue.filter=status:pending due.before:now\n" + "report.overdue.filter=status:pending +OVERDUE\n" "\n" "report.active.description=Lists active tasks\n" "report.active.columns=id,project,priority,due,start.active,entry.age,description\n" @@ -383,27 +383,33 @@ std::string Config::_defaults = "\n" "report.next.description=Lists the most urgent tasks\n" "report.next.columns=id,project,priority,due,start.active,entry.age,urgency,description\n" - "report.next.filter=status:pending limit:page\n" "report.next.labels=ID,Project,Pri,Due,A,Age,Urgency,Description\n" "report.next.sort=urgency-,due+,priority-,start-,project+\n" + "report.next.filter=status:pending limit:page\n" "\n" "report.ready.description=Lists the most urgent tasks\n" "report.ready.columns=id,project,priority,due,start.active,entry.age,urgency,description\n" - "report.ready.filter=status:pending limit:page wait.none: '(scheduled.none: or scheduled.before:now )'\n" "report.ready.labels=ID,Project,Pri,Due,A,Age,Urgency,Description\n" "report.ready.sort=urgency-,due+,priority-,start-,project+\n" + "report.ready.filter=status:pending limit:page wait.none: '(scheduled.none: or scheduled.before:now )'\n" "\n" "report.blocked.description=Lists all blocked tasks\n" "report.blocked.columns=id,depends,project,priority,due,start.active,entry.age,description\n" "report.blocked.labels=ID,Deps,Project,Pri,Due,Active,Age,Description\n" "report.blocked.sort=due+,priority-,start-,project+\n" - "report.blocked.filter=status:pending depends.any:\n" + "report.blocked.filter=status:pending +BLOCKED\n" "\n" "report.unblocked.description=Lists all unblocked tasks\n" "report.unblocked.columns=id,depends,project,priority,due,start.active,entry.age,description\n" "report.unblocked.labels=ID,Deps,Project,Pri,Due,Active,Age,Description\n" "report.unblocked.sort=due+,priority-,start-,project+\n" - "report.unblocked.filter=status:pending depends.none:\n" + "report.unblocked.filter=status:pending -BLOCKED\n" + "\n" + "report.blocking.description=Lists all blocking tasks\n" + "report.blocking.columns=id,depends,project,priority,due,start.active,entry.age,description\n" + "report.blocking.labels=ID,Deps,Project,Pri,Due,Active,Age,Description\n" + "report.blocking.sort=due+,priority-,start-,project+\n" + "report.blocking.filter=status:pending +BLOCKING\n" "\n"; //////////////////////////////////////////////////////////////////////////////// diff --git a/src/Task.cpp b/src/Task.cpp index 5fbfc5996..0cb4755f5 100644 --- a/src/Task.cpp +++ b/src/Task.cpp @@ -955,6 +955,7 @@ bool Task::hasTag (const std::string& tag) const TODO YEAR - due this year TODO ANNOTATED - has any annotations TODO ACTIVE - is active + TODO READY - is ready TODO SCHEDULED - is scheduled TODO WAITING - is waiting TODO CHILD - is a child