[Mpuls-commits] r3839 - base/trunk

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-10-01 12:12:49 +0200 (Fri, 01 Oct 2010)
New Revision: 3839

Modified:
   base/trunk/ChangeLog
Log:
Updated ChangeLog


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-10-01 10:10:32 UTC (rev 3838)
+++ base/trunk/ChangeLog	2010-10-01 10:12:49 UTC (rev 3839)
@@ -1,5 +1,10 @@
-2010-10-02 Roland Geider <roland.geider at intevation.de>
+2010-10-01  Torsten Irländer <torsten.irlaender at intevation.de>
 
+	* mpulsweb/model/phase.py (Phase.getDescription): Return unescaped
+	description of phase.
+
+2010-10-01 Roland Geider <roland.geider at intevation.de>
+
 	* mpulsweb/public/styles/color3.css,
 	  mpulsweb/templates/logbook/overview.mako: fix some CSS bugs
 
@@ -62,7 +67,6 @@
 	  the phase in templates as it can include html "&shy;" to divide long
 	  phasenames.
 
->>>>>>> .r3831
 2010-09-28  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/lib/search.py (CaseSearch.get_allowed_viewer_clause):