You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by le...@apache.org on 2011/09/08 21:44:59 UTC
svn commit: r1166874 - in /esme/branches/lift-2.4: ./ CHANGES.txt server/
server/pom.xml server/src/main/resources/props/compass.filesystem.cfg.xml
server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
Author: lester
Date: Thu Sep 8 19:44:59 2011
New Revision: 1166874
URL: http://svn.apache.org/viewvc?rev=1166874&view=rev
Log:
Merged latest changes from trunk.
Modified:
esme/branches/lift-2.4/ (props changed)
esme/branches/lift-2.4/CHANGES.txt
esme/branches/lift-2.4/server/ (props changed)
esme/branches/lift-2.4/server/pom.xml
esme/branches/lift-2.4/server/src/main/resources/props/compass.filesystem.cfg.xml (props changed)
esme/branches/lift-2.4/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
Propchange: esme/branches/lift-2.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 8 19:44:59 2011
@@ -1,3 +1,3 @@
/esme/branches/lift-2.2/trunk:1051384-1055974
-/esme/trunk:1150805-1152180
+/esme/trunk:1150805-1166873
/incubator/esme/branches/lift-2.2/trunk:1043371-1051383
Modified: esme/branches/lift-2.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.4/CHANGES.txt?rev=1166874&r1=1166873&r2=1166874&view=diff
==============================================================================
--- esme/branches/lift-2.4/CHANGES.txt (original)
+++ esme/branches/lift-2.4/CHANGES.txt Thu Sep 8 19:44:59 2011
@@ -1,7 +1,7 @@
Apache Enterprise Social Messaging Environment (ESME) Change Log
-Release 1.3 - 07/23/2011
+Release 1.3 - 08/22/2011
** Bug
* [ESME-268] - User should not be offered the option to "resend" their own messages - it has no effect
@@ -10,6 +10,8 @@ Release 1.3 - 07/23/2011
* [ESME-336] - Streams shows all pools rather than the pools in which I'm a member
* [ESME-342] - Sign On button doesn't work in IE9
* [ESME-344] - Searching for "test" doesn't display messages containing that string
+ * [ESME-353] - Tags aren't working any more
+ * [ESME-354] - Reply setting does not get removed from main timeline view after the message is sent
** Improvement
* [ESME-233] - Restrict access to the logchanger in production mode
Propchange: esme/branches/lift-2.4/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 8 19:44:59 2011
@@ -1,6 +1,6 @@
/esme/branches/esme-328_comet_timeline_rewrite:1088273-1090390
/esme/branches/lift-2.2/trunk/server:1051384-1055974
-/esme/trunk/server:1150805-1152180
+/esme/trunk/server:1150805-1166873
/incubator/esme/branches/lift-2.0/server:928728-939625
/incubator/esme/branches/lift-2.2/trunk/server:1043371-1051383
/incubator/esme/branches/lift-2.2/trunk/server/src/main/webapp/info_view:1043380-1044792
Modified: esme/branches/lift-2.4/server/pom.xml
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.4/server/pom.xml?rev=1166874&r1=1166873&r2=1166874&view=diff
==============================================================================
--- esme/branches/lift-2.4/server/pom.xml (original)
+++ esme/branches/lift-2.4/server/pom.xml Thu Sep 8 19:44:59 2011
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.esme</groupId>
<artifactId>esme-server</artifactId>
- <version>apache-esme-1.3</version>
+ <version>apache-esme-1.4</version>
<packaging>war</packaging>
<name>Apache Enterprise Social Messaging Environment (ESME)</name>
<url>http://esme.apache.org</url>
Propchange: esme/branches/lift-2.4/server/src/main/resources/props/compass.filesystem.cfg.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 8 19:44:59 2011
@@ -1,6 +1,6 @@
/esme/branches/esme-328_comet_timeline_rewrite/src/main/resources/props/compass.filesystem.cfg.xml:1088273-1090390
/esme/branches/lift-2.2/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1051384-1055974
-/esme/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1150805-1152180
+/esme/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1150805-1166873
/incubator/esme/branches/lift-2.2/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1043371-1051383
/incubator/esme/branches/metadata/src/main/resources/props/compass.filesystem.cfg.xml:966215-979767
/incubator/esme/branches/tagandconversationfollow/src/main/resources/props/compass.filesystem.cfg.xml:966215-1006324
Modified: esme/branches/lift-2.4/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.4/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala?rev=1166874&r1=1166873&r2=1166874&view=diff
==============================================================================
--- esme/branches/lift-2.4/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala (original)
+++ esme/branches/lift-2.4/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala Thu Sep 8 19:44:59 2011
@@ -177,7 +177,8 @@ class UserSnip extends DispatchSnippet {
"tags" -> ValById("vTag"),
"access_pool" -> ValById("vPool"),
"reply-to" -> JsVar("currentConvNumber"))) &
- SetValById("vMsg", "")
+ SetValById("vMsg", "") &
+ Run("clearReplyTo()")
))
}
</xml:group>