Author: sebawagner
Date: Sun Jun 3 10:14:08 2012
New Revision: 1345643
URL: http://svn.apache.org/viewvc?rev=1345643&view=rev
Log:
Show max upload size in Backup UI
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/backup/backupContent.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
Sun Jun 3 10:14:08 2012
@@ -4497,4 +4497,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
Sun Jun 3 10:14:08 2012
@@ -4494,5 +4494,8 @@ see http://incubator.apache.org/openmeet
</string>
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
+ </string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
</string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
Sun Jun 3 10:14:08 2012
@@ -4495,5 +4495,8 @@ see http://incubator.apache.org/openmeet
</string>
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
+ </string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
</string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20simplified.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml Sun Jun 3 10:14:08 2012
@@ -4496,4 +4496,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml Sun Jun 3 10:14:08 2012
@@ -4508,4 +4508,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
Sun Jun 3 10:14:08 2012
@@ -4496,4 +4496,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
Sun Jun 3 10:14:08 2012
@@ -4494,5 +4494,8 @@ see http://incubator.apache.org/openmeet
</string>
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
+ </string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
</string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml Sun Jun 3 10:14:08 2012
@@ -4495,5 +4495,8 @@ see http://incubator.apache.org/openmeet
</string>
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
+ </string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
</string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
Sun Jun 3 10:14:08 2012
@@ -5963,4 +5963,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
Sun Jun 3 10:14:08 2012
@@ -4492,4 +4492,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
Sun Jun 3 10:14:08 2012
@@ -5939,4 +5939,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
Sun Jun 3 10:14:08 2012
@@ -4495,4 +4495,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
Sun Jun 3 10:14:08 2012
@@ -4496,4 +4496,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
Sun Jun 3 10:14:08 2012
@@ -4496,4 +4496,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
Sun Jun 3 10:14:08 2012
@@ -4496,4 +4496,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
Sun Jun 3 10:14:08 2012
@@ -4495,5 +4495,8 @@ see http://incubator.apache.org/openmeet
</string>
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
+ </string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
</string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
Sun Jun 3 10:14:08 2012
@@ -4496,4 +4496,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
Sun Jun 3 10:14:08 2012
@@ -4496,4 +4496,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
Sun Jun 3 10:14:08 2012
@@ -4496,4 +4496,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
Sun Jun 3 10:14:08 2012
@@ -4477,4 +4477,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
Sun Jun 3 10:14:08 2012
@@ -4496,4 +4496,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
Sun Jun 3 10:14:08 2012
@@ -4496,4 +4496,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
Sun Jun 3 10:14:08 2012
@@ -4569,4 +4569,7 @@ transmitowania gÅosu i obrazu wideo.<
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues%20brazil.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml Sun Jun 3 10:14:08 2012
@@ -4497,4 +4497,7 @@ Details
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
Sun Jun 3 10:14:08 2012
@@ -4496,4 +4496,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
Sun Jun 3 10:14:08 2012
@@ -4496,4 +4496,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
Sun Jun 3 10:14:08 2012
@@ -4495,5 +4495,8 @@ see http://incubator.apache.org/openmeet
</string>
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
+ </string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
</string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
Sun Jun 3 10:14:08 2012
@@ -4504,4 +4504,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
Sun Jun 3 10:14:08 2012
@@ -4496,4 +4496,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Sun
Jun 3 10:14:08 2012
@@ -4496,4 +4496,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
Sun Jun 3 10:14:08 2012
@@ -4495,4 +4495,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
Sun Jun 3 10:14:08 2012
@@ -4496,4 +4496,7 @@ see http://incubator.apache.org/openmeet
<string id="1490" name="conference menu">
<value>Change your whiteboard settings</value>
</string>
+ <string id="1491" name="backup admin">
+ <value>Max upload size</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Sun Jun 3 10:14:08 2012
@@ -655,6 +655,10 @@
if ($debug) Debug.write("red5sip.enable is: ",
value[1].conf_value);
canvas.setAttribute('RED5_SIP_ENABLE',
value[1].conf_value);
}
+ if (value.length > 2) {
+ if ($debug) Debug.write("max_upload_size is: ",
value[2].conf_value);
+ canvas.setAttribute('MAX_UPLOAD_SIZE',
value[2].conf_value);
+ }
} else {
if ($debug) Debug.warn("xmlcrm.getGeneralOptions empty!");
}
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
Sun Jun 3 10:14:08 2012
@@ -454,6 +454,10 @@ and some more references to temp-objects
-->
<attribute name="RED5_SIP_ENABLE" value="no" type="string" />
+<!--
+ The server side configuration of the max upload size for files
+ -->
+<attribute name="MAX_UPLOAD_SIZE" value="-1" type="string" />
<attribute name="currentNC" value="null" />
@@ -481,5 +485,4 @@ and some more references to temp-objects
-->
<attribute name="currentActivityList" value="null" />
-
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/backup/backupContent.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/backup/backupContent.lzx?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/backup/backupContent.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/backup/backupContent.lzx
Sun Jun 3 10:14:08 2012
@@ -71,7 +71,14 @@
lz.Browser.loadURL(exporturl,"_parent");
]]>
</handler>
- </simpleLabelButton>
+ </simpleLabelButton>
+
+ <labelText fontsize="10" fontstyle="italic" y="250" x="10">
+ <handler name="oninit">
+ var mBytes =
Math.round(Number(canvas.MAX_UPLOAD_SIZE)/1024/1024);
+ this.setAttribute("text",canvas.getLabelName(1491)+" "+mBytes+"
MB [max_upload_size = "+canvas.MAX_UPLOAD_SIZE+" Bytes]");
+ </handler>
+ </labelText>
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java?rev=1345643&r1=1345642&r2=1345643&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
Sun Jun 3 10:14:08 2012
@@ -738,6 +738,7 @@ public class MainService implements IPen
cList.add(cfgManagement.getConfKey(3,
"exclusive.audio.keycode"));
cList.add(cfgManagement.getConfKey(3,
"red5sip.enable"));
+ cList.add(cfgManagement.getConfKey(3,
"max_upload_size"));
return cList;