You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wave-commits@incubator.apache.org by yu...@apache.org on 2016/11/11 16:34:21 UTC
[37/50] [abbrv] incubator-wave git commit: Merge branch 'fixes'
Merge branch 'fixes'
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/ccab725c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/ccab725c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/ccab725c
Branch: refs/heads/swellrt
Commit: ccab725c689052e1ff2476380b433e86b1e6ef1c
Parents: 845e39a 08c4636
Author: Pablo Ojanguren <pa...@gmail.com>
Authored: Mon Oct 10 16:43:50 2016 +0200
Committer: Pablo Ojanguren <pa...@gmail.com>
Committed: Mon Oct 10 16:43:50 2016 +0200
----------------------------------------------------------------------
wave/config/email/EmailMessages.properties | 7 +-
wave/config/email/EmailMessages_en.properties | 7 +-
wave/config/email/EmailMessages_es.properties | 7 +-
wave/config/email/Join.vm | 25 +++
wave/src/main/java/org/swellrt/api/SwellRT.java | 187 +++++++++++--------
.../main/java/org/swellrt/api/WaveClient.java | 28 ++-
.../java/org/swellrt/api/js/WaveClientJS.java | 16 ++
.../server/box/servlet/JoinMessageService.java | 155 +++++++++++++++
.../server/box/servlet/QueryModelService.java | 8 +-
.../server/box/servlet/SwellRtServlet.java | 26 +--
10 files changed, 367 insertions(+), 99 deletions(-)
----------------------------------------------------------------------