You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/01/28 14:34:36 UTC
[1/3] openmeetings git commit: [OPENMEETINGS-1777] library versions
are updated
Repository: openmeetings
Updated Branches:
refs/heads/wicket-defer-all df99fa207 -> 4df2abc2f
[OPENMEETINGS-1777] library versions are updated
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/da7bf990
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/da7bf990
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/da7bf990
Branch: refs/heads/wicket-defer-all
Commit: da7bf99013dce0710f0e05cb81f41952e4161b0a
Parents: e5bf058
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sun Jan 28 16:02:28 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sun Jan 28 16:02:28 2018 +0700
----------------------------------------------------------------------
openmeetings-db/pom.xml | 2 +-
pom.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/da7bf990/openmeetings-db/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index 337bd59..d98e87e 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -35,7 +35,7 @@
<commons-dbcp.version>2.2.0</commons-dbcp.version>
<commons-pool.version>1.6</commons-pool.version> <!-- required by OpenJPA for clustering -->
<commons-pool2.version>2.5.0</commons-pool2.version>
- <postgresql.version>42.1.4</postgresql.version>
+ <postgresql.version>42.2.1</postgresql.version>
<site.basedir>${project.parent.basedir}</site.basedir>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/da7bf990/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2aceccd..a49d87b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,13 +48,13 @@
<checksum-maven-plugin.version>1.6</checksum-maven-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<license-maven-plugin.version>1.14</license-maven-plugin.version>
- <reflow-skin.version>1.3.5</reflow-skin.version>
+ <reflow-skin.version>1.3.6</reflow-skin.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
<maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
<maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
- <maven-bundle-plugin.version>3.3.0</maven-bundle-plugin.version>
+ <maven-bundle-plugin.version>3.5.0</maven-bundle-plugin.version>
<maven-war-plugin.version>3.2.0</maven-war-plugin.version>
<!-- dependency versions -->
<junit.version>4.12</junit.version>
@@ -63,7 +63,7 @@
<wickets.version>8.0.0-SNAPSHOT</wickets.version>
<red5-server.version>1.0.10-M4</red5-server.version>
<red5-client.version>1.0.10-M4</red5-client.version>
- <spring.version>4.3.13.RELEASE</spring.version>
+ <spring.version>4.3.14.RELEASE</spring.version>
<mina.version>2.0.16</mina.version>
<tomcat.version>9.0.4</tomcat.version>
<ical4j.version>2.1.5</ical4j.version>
[2/3] openmeetings git commit: Merge branch '4.0.x' into
wicket-defer-all
Posted by so...@apache.org.
Merge branch '4.0.x' into wicket-defer-all
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/25f3355b
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/25f3355b
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/25f3355b
Branch: refs/heads/wicket-defer-all
Commit: 25f3355b045e2ca6ed9cad3db585c50579acf6ce
Parents: df99fa2 da7bf99
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sun Jan 28 20:24:19 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sun Jan 28 20:24:19 2018 +0700
----------------------------------------------------------------------
openmeetings-db/pom.xml | 2 +-
pom.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[3/3] openmeetings git commit: Named function is fixed to work with
deferred mode
Posted by so...@apache.org.
Named function is fixed to work with deferred mode
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/4df2abc2
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/4df2abc2
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/4df2abc2
Branch: refs/heads/wicket-defer-all
Commit: 4df2abc2f9dacf58a70f4102520f84bcb3b203df
Parents: 25f3355
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sun Jan 28 21:34:26 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sun Jan 28 21:34:26 2018 +0700
----------------------------------------------------------------------
.../org/apache/openmeetings/web/util/CallbackFunctionHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4df2abc2/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
index dca35d9..0319f1a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
@@ -31,7 +31,7 @@ public class CallbackFunctionHelper {
private static StringBuilder getNamedFunctionStr(String name, AbstractDefaultAjaxBehavior b, CallbackParameter... extraParameters) {
StringBuilder sb = new StringBuilder();
- sb.append("function ").append(name).append("(");
+ sb.append("window.").append(name).append(" = function(");
boolean first = true;
for (CallbackParameter curExtraParameter : extraParameters) {
if (curExtraParameter.getFunctionParameterName() != null) {