diff --git a/AUTHORS b/AUTHORS index 508681491..e32b70570 100644 --- a/AUTHORS +++ b/AUTHORS @@ -139,4 +139,5 @@ suggestions: Ethan Schoonover Paul Kishimoto Jeff Schroeder + Bryan Kam diff --git a/ChangeLog b/ChangeLog index 3344d571d..42e73cd1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,9 @@ Bugs directly by external script when a variable is override. + Fixed bug #990, which prevents color precedence to be applied correctly for tagged tasks. + + Fixed bug #1008, which failed to remove tasks with the special tag '+nocal' + from the calendar report output with 'calendar.details=full' set (thanks to + Bryan Kam). ------ old releases ------------------------------ diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp index da621607c..e65d0a790 100644 --- a/src/commands/CmdCalendar.cpp +++ b/src/commands/CmdCalendar.cpp @@ -338,7 +338,7 @@ int CmdCalendar::execute (std::string& output) context.a3.clear (); context.a3.push_back (Arg ("task", Arg::cat_program)); - report_filter += " due.after:" + after + " due.before:" + before; + report_filter += " due.after:" + after + " due.before:" + before + " -nocal"; context.config.set ("report." + report + ".filter", report_filter); // Display all due task in the report colorized not only the imminet ones