=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java 2015-10-20 04:15:40 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java 2015-10-20 08:22:33 +0000 @@ -30,7 +30,6 @@ import org.hisp.dhis.common.DimensionService; import org.hisp.dhis.dxf2.common.ImportOptions; -import org.hisp.dhis.dxf2.render.RenderService; import org.hisp.dhis.dxf2.webmessage.WebMessageException; import org.hisp.dhis.eventreport.EventReport; import org.hisp.dhis.eventreport.EventReportService; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm 2015-10-20 08:19:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm 2015-10-20 08:22:33 +0000 @@ -269,7 +269,7 @@ - $i18n.getString( "filter" ) Tip: use d2:daysBetween(x,y) d2:condition(bool-expr,true-val,false-val) d2:zing(x) d2:oizp(x) + $i18n.getString( "filter" ) Tip: use d2:daysBetween(date,date) d2:condition(bool-expr,true-val,false-val) d2:zing(x) d2:oizp(x)