=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2012-02-15 17:10:29 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2012-02-15 17:26:35 +0000 @@ -321,7 +321,6 @@ executeSql( "ALTER TABLE messageconversation DROP COLUMN messageconversationkey" ); executeSql( "UPDATE messageconversation SET lastmessage=lastupdated WHERE lastmessage is null" ); - executeSql( "ALTER TABLE messageconversation DROP COLUMN lastupdated" ); executeSql( "ALTER TABLE message DROP COLUMN messagesubject" ); executeSql( "ALTER TABLE message DROP COLUMN messagekey" ); executeSql( "ALTER TABLE message DROP COLUMN sentdate" ); === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/MessageConversation.hbm.xml' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/MessageConversation.hbm.xml 2012-02-15 17:10:29 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/MessageConversation.hbm.xml 2012-02-15 17:26:35 +0000 @@ -13,6 +13,7 @@ + === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/unmarked.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/unmarked.png 2009-12-23 14:20:19 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/unmarked.png 2012-02-15 17:26:35 +0000 differ === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/unmarked_large.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/unmarked_large.png 2009-12-23 07:35:17 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/unmarked_large.png 2012-02-15 17:26:35 +0000 differ === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm 2012-02-15 17:10:29 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm 2012-02-15 17:26:35 +0000 @@ -20,7 +20,7 @@ #foreach( $conversation in $conversations ) - + $!encoder.htmlEncode( $conversation.lastSenderName ) $!encoder.htmlEncode( $conversation.subject )