[Mpuls-commits] r3687 - wasko/trunk

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-09-16 15:30:10 +0200 (Thu, 16 Sep 2010)
New Revision: 3687

Modified:
   wasko/trunk/ChangeLog
Log:
Updated ChangeLog


Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2010-09-16 13:29:56 UTC (rev 3686)
+++ wasko/trunk/ChangeLog	2010-09-16 13:30:10 UTC (rev 3687)
@@ -1,3 +1,10 @@
+2010-09-16  Torsten Irländer <torsten.irlaender at intevation.de>
+
+	* wasko.json: Set "minimal_consistence_conditon" for WASKO
+	* waskoweb/templates/casemanagement/main.mako: Issue1123: Added more
+	conditions to hide option on not editable cases.
+	* wasko.json: Disabled tags, and copy-function.
+
 2010-09-16  Roland Geider  <roland.geider at intevation.de>
 
 	* waskoweb/public/formed/formedtree.xml: issue936: change options for
@@ -91,6 +98,7 @@
 
 	* waskoweb/public/images/mpuls.ico: issue619 updated favicon
 
+>>>>>>> .r3681
 2010-09-09  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* waskoweb/templates/casemanagement/digest_body.mako: Issue1023: Use