Author: solomax
Date: Sun Oct 9 08:47:33 2016
New Revision: 1763946
URL: http://svn.apache.org/viewvc?rev=1763946&view=rev
Log:
[OPENMEETINGS-1488] DAO and group admin parts are finished
Added:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
- copied unchanged from r1763945,
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html
- copied unchanged from r1763945,
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/images/blank.png
(with props)
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
- copied unchanged from r1763945,
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java
- copied, changed from r1763851,
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html
- copied unchanged from r1763945,
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
- copied, changed from r1763851,
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/images/blank.png
(with props)
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
- copied unchanged from r1763945,
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java
- copied, changed from r1763851,
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html
- copied unchanged from r1763945,
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
- copied, changed from r1763851,
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/images/blank.png
(with props)
Removed:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.html
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/admin.css
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
Sun Oct 9 08:47:33 2016
@@ -122,14 +122,15 @@ public class GenerateImage extends BaseC
private ConverterProcessResult convertSingleJpg(String inputFile, File
outputfile) throws IOException {
String[] argv = new String[] { getPathToImageMagick(),
inputFile, outputfile.getCanonicalPath() };
- return ProcessHelper.executeScript("generateBatchThumbByWidth",
argv);
+ return ProcessHelper.executeScript("convertSingleJpg", argv);
}
- public ConverterProcessResult convertImageByTypeAndSize(String
inputFile,
- String outputfile, int width, int height) {
- String[] argv = new String[] { getPathToImageMagick(), "-size",
- width + "x" + height, inputFile, outputfile };
- return
ProcessHelper.executeScript("convertImageByTypeAndSizeAndDepth", argv);
+ public ConverterProcessResult resize(File in, File out, Integer width,
Integer height) throws IOException {
+ String[] argv = new String[] { getPathToImageMagick()
+ , "-size", (width == null ? "" : width) +
(height == null ? "" : "x" + height)
+ , in.getCanonicalPath(), out.getCanonicalPath()
+ };
+ return ProcessHelper.executeScript("GenerateImage::resize",
argv);
}
public ConverterProcessResult convertImageByTypeAndSizeAndDepth(
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
Sun Oct 9 08:47:33 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.core.data.file;
+import static org.apache.openmeetings.util.OmFileHelper.FILES_DIR;
import static org.apache.openmeetings.util.OmFileHelper.getUploadFilesDir;
import static org.apache.openmeetings.util.OmFileHelper.getUploadTempFilesDir;
import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix;
@@ -117,16 +118,16 @@ public class FileProcessor {
log.debug("canBeConverted: " + canBeConverted);
if (canBeConverted) {
// convert to pdf, thumbs, swf and xml-description
- returnError = generatePDF.convertPDF(hash, "files",
true, completeName);
+ returnError = generatePDF.convertPDF(hash, FILES_DIR,
true, completeName);
} else if (isPdf) {
// convert to thumbs, swf and xml-description
- returnError = generatePDF.convertPDF(hash, "files",
false, completeName);
+ returnError = generatePDF.convertPDF(hash, FILES_DIR,
false, completeName);
} else if (isChart) {
log.debug("uploaded chart file");
} else if (isImage && !isAsIs) {
// convert it to JPG
log.debug("##### convert it to JPG: ");
- returnError = generateImage.convertImage(hash, extDot,
"files");
+ returnError = generateImage.convertImage(hash, extDot,
FILES_DIR);
} else if (isAsIs) {
ConverterProcessResult processThumb =
generateThumbs.generateThumb(thumbImagePrefix, completeName, 50);
returnError.addItem("processThumb", processThumb);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
Sun Oct 9 08:47:33 2016
@@ -44,40 +44,68 @@ import org.simpleframework.xml.Root;
, @NamedQuery(name="countGroups", query="SELECT COUNT(c) FROM Group AS
c WHERE c.deleted = false")
})
@Table(name = "om_group")
-@Root(name="organisation")
+@Root(name = "organisation")
public class Group implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
-
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@Element(data = true, name = "organisation_id")
private Long id;
-
- @Column(name="name")
+
+ @Column(name = "name")
@Element(data = true, required = false)
private String name;
-
- @Column(name="insertedby")
+
+ @Column(name = "insertedby")
private Long insertedby;
-
- @Column(name="updatedby")
+
+ @Column(name = "updatedby")
private Long updatedby;
-
- @Column(name="inserted")
+
+ @Column(name = "inserted")
private Date inserted;
-
- @Column(name="updated")
+
+ @Column(name = "updated")
private Date updated;
-
- @Column(name="deleted")
+
+ @Column(name = "deleted")
@Element(data = true, required = false)
private boolean deleted;
-
+
+ @Column(name = "tag")
+ @Element(data = true, required = false)
+ private String tag;
+
+ @Column(name = "limited")
+ @Element(data = true, required = false)
+ private boolean limited;
+
+ @Column(name = "max_files_size")
+ @Element(data = true, required = false)
+ private int maxFilesSize;
+
+ @Column(name = "max_rec_size")
+ @Element(data = true, required = false)
+ private int maxRecordingsSize;
+
+ @Column(name = "max_rooms")
+ @Element(data = true, required = false)
+ private int maxRooms;
+
+ @Column(name = "recording_ttl")
+ @Element(data = true, required = false)
+ private int recordingTtl;
+
+ @Column(name = "reminder_days")
+ @Element(data = true, required = false)
+ private int reminderDays;
public Long getInsertedby() {
return insertedby;
}
+
public void setInsertedby(Long insertedby) {
this.insertedby = insertedby;
}
@@ -85,6 +113,7 @@ public class Group implements IDataProvi
public String getName() {
return name;
}
+
public void setName(String name) {
this.name = name;
}
@@ -93,6 +122,7 @@ public class Group implements IDataProvi
public Long getId() {
return id;
}
+
@Override
public void setId(Long id) {
this.id = id;
@@ -101,14 +131,15 @@ public class Group implements IDataProvi
public Long getUpdatedby() {
return updatedby;
}
+
public void setUpdatedby(Long updatedby) {
this.updatedby = updatedby;
- }
-
+ }
public Date getInserted() {
return inserted;
}
+
public void setInserted(Date inserted) {
this.inserted = inserted;
}
@@ -116,18 +147,77 @@ public class Group implements IDataProvi
public Date getUpdated() {
return updated;
}
+
public void setUpdated(Date updated) {
this.updated = updated;
}
-
+
public boolean isDeleted() {
return deleted;
}
+
public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
+
+ public String getTag() {
+ return tag;
+ }
+
+ public void setTag(String tag) {
+ this.tag = tag;
+ }
+
+ public boolean isLimited() {
+ return limited;
+ }
+
+ public void setLimited(boolean limited) {
+ this.limited = limited;
+ }
+
+ public int getMaxFilesSize() {
+ return maxFilesSize;
+ }
+
+ public void setMaxFilesSize(int maxFilesSize) {
+ this.maxFilesSize = maxFilesSize;
+ }
+
+ public int getMaxRecordingsSize() {
+ return maxRecordingsSize;
+ }
+
+ public void setMaxRecordingsSize(int maxRecordingsSize) {
+ this.maxRecordingsSize = maxRecordingsSize;
+ }
+
+ public int getMaxRooms() {
+ return maxRooms;
+ }
+
+ public void setMaxRooms(int maxRooms) {
+ this.maxRooms = maxRooms;
+ }
+
+ public int getRecordingTtl() {
+ return recordingTtl;
+ }
+
+ public void setRecordingTtl(int recordingTtl) {
+ this.recordingTtl = recordingTtl;
+ }
+
+ public int getReminderDays() {
+ return reminderDays;
+ }
+
+ public void setReminderDays(int reminderDays) {
+ this.reminderDays = reminderDays;
+ }
+
@Override
public String toString() {
return "Group [id=" + id + ", name=" + name + ", deleted=" +
deleted + "]";
- }
+ }
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
Sun Oct 9 08:47:33 2016
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.util;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -31,7 +33,7 @@ import org.red5.logging.Red5LoggerFactor
import org.slf4j.Logger;
public class OmFileHelper {
- private static final Logger log =
Red5LoggerFactory.getLogger(OmFileHelper.class,
OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(OmFileHelper.class, webAppRootKey);
/**
* This variable needs to point to the openmeetings webapp directory
@@ -39,11 +41,11 @@ public class OmFileHelper {
private static File OM_HOME = null;
private static final String UPLOAD_DIR = "upload";
private static final String UPLOAD_TEMP_DIR = "uploadtemp";
- private static final String FILES_DIR = "files";
private static final String PUBLIC_DIR = "public";
private static final String CLIPARTS_DIR = "cliparts";
private static final String WEB_INF_DIR = "WEB-INF";
private static final String PROFILES_DIR = "profiles";
+ private static final String GROUP_LOGO_DIR = "grouplogo";
private static final String STREAMS_DIR = "streams";
private static final String EMOTIONS_DIR = "emoticons";
private static final String LANGUAGES_DIR = "languages";
@@ -54,11 +56,12 @@ public class OmFileHelper {
private static final String DEFAULT_DIR = "default";
private static final String IMAGES_DIR = "images";
private static final String WML_DIR = "stored";
-
+
private static final String INSTALL_FILE = "install.xml";
-
+
public static final String SCREENSHARING_DIR = "screensharing";
+ public static final String FILES_DIR = "files";
public static final String PERSISTENCE_NAME =
"classes/META-INF/persistence.xml";
public static final String DB_PERSISTENCE_NAME =
"classes/META-INF/%s_persistence.xml";
public static final String profilesPrefix = "profile_";
@@ -89,24 +92,25 @@ public class OmFileHelper {
public static final String FLV_MIME_TYPE = "video/" + EXTENSION_FLV;
public static final String MP4_MIME_TYPE = "video/" + EXTENSION_MP4;
public static final String JPG_MIME_TYPE = "image/jpeg";
+ public static final String PNG_MIME_TYPE = "image/png";
public static void setOmHome(File omHome) {
OmFileHelper.OM_HOME = omHome;
}
-
+
public static void setOmHome(String omHome) {
OmFileHelper.OM_HOME = new File(omHome);
}
-
+
public static File getRootDir() {
- //FIXME hack !!!!
+ // FIXME hack !!!!
return getOmHome().getParentFile().getParentFile();
}
-
+
public static File getOmHome() {
return OmFileHelper.OM_HOME;
}
-
+
private static File getDir(File parent, String name) {
File f = new File(parent, name);
if (!f.exists()) {
@@ -114,31 +118,43 @@ public class OmFileHelper {
}
return f;
}
-
+
public static File getUploadDir() {
return new File(OmFileHelper.OM_HOME, UPLOAD_DIR);
}
-
+
public static File getUploadFilesDir() {
return getDir(getUploadDir(), FILES_DIR);
}
-
+
public static File getUploadProfilesDir() {
return getDir(getUploadDir(), PROFILES_DIR);
}
-
+
public static File getUploadProfilesUserDir(Long userId) {
return getDir(getUploadProfilesDir(), profilesPrefix + userId);
}
-
+
public static File getUploadProfilesUserDir(String userId) {
return getDir(getUploadProfilesDir(), profilesPrefix + userId);
}
-
+
+ public static File getGroupLogoDir() {
+ return getDir(getUploadDir(), GROUP_LOGO_DIR);
+ }
+
+ public static File getGroupLogo(Long groupId, boolean check) {
+ File logo = new File(getGroupLogoDir(),
String.format("logo%s.png", groupId));
+ if (check && !logo.exists()) {
+ logo = new File(getImagesDir(), "blank.png");
+ }
+ return logo;
+ }
+
public static File getDefaultProfilePicture() {
return new File(getImagesDir(), defaultProfileImageName);
}
-
+
public static File getUserProfilePicture(Long userId, String uri) {
File img = new File(getUploadProfilesUserDir(userId),
profileImagePrefix + uri);
if (!img.exists()) {
@@ -146,23 +162,23 @@ public class OmFileHelper {
}
return img;
}
-
+
public static File getUserDashboard(Long userId) {
return new File(getUploadProfilesUserDir(userId),
dashboardFile);
}
-
+
public static File getUploadImportDir() {
return getDir(getUploadDir(), IMPORT_DIR);
}
-
+
public static File getUploadBackupDir() {
return getDir(getUploadDir(), BACKUP_DIR);
}
-
+
public static File getUploadRoomDir(String roomName) {
return getDir(getUploadDir(), roomName);
}
-
+
public static File getUploadWmlDir() {
return getDir(getUploadDir(), WML_DIR);
}
@@ -190,11 +206,11 @@ public class OmFileHelper {
public static File getStreamsDir() {
return getDir(OmFileHelper.OM_HOME, STREAMS_DIR);
}
-
+
public static File getStreamsHibernateDir() {
return getDir(getStreamsDir(), HIBERNATE_DIR);
}
-
+
public static File getRecording(String name) {
return new File(getDir(getStreamsDir(), HIBERNATE_DIR), name);
}
@@ -210,7 +226,7 @@ public class OmFileHelper {
public static File getStreamsSubDir(Long id) {
return getDir(getStreamsDir(), id.toString());
}
-
+
public static File getStreamsSubDir(String name) {
return getDir(getStreamsDir(), name);
}
@@ -218,47 +234,47 @@ public class OmFileHelper {
public static File getRecordingMetaData(Long roomId, String name) {
return new File(getStreamsSubDir(roomId), name + FLV_EXTENSION);
}
-
+
public static File getLanguagesDir() {
return new File(OmFileHelper.OM_HOME, LANGUAGES_DIR);
}
-
+
public static File getPublicDir() {
return new File(OmFileHelper.OM_HOME, PUBLIC_DIR);
}
-
+
public static File getPublicClipartsDir() {
return new File(getPublicDir(), CLIPARTS_DIR);
}
-
+
public static File getPublicEmotionsDir() {
return new File(getPublicDir(), EMOTIONS_DIR);
}
-
+
public static File getWebinfDir() {
return new File(OmFileHelper.OM_HOME, WEB_INF_DIR);
}
-
+
public static File getPersistence() {
return getPersistence((DbType)null);
}
-
+
public static File getPersistence(String dbType) {
return getPersistence(DbType.valueOf(dbType));
}
-
+
public static File getPersistence(DbType dbType) {
return new File(OmFileHelper.getWebinfDir(), dbType == null ?
PERSISTENCE_NAME : String.format(DB_PERSISTENCE_NAME, dbType));
}
-
+
public static File getConfDir() {
return new File(OmFileHelper.OM_HOME, CONF_DIR);
}
-
+
public static File getInstallFile() {
return new File(getConfDir(), INSTALL_FILE);
}
-
+
public static File getScreenSharingDir() {
return new File(OmFileHelper.OM_HOME, SCREENSHARING_DIR);
}
@@ -270,7 +286,7 @@ public class OmFileHelper {
public static File getImagesDir() {
return new File(OmFileHelper.OM_HOME, IMAGES_DIR);
}
-
+
public static File appendSuffix(File original, String suffix) {
File parent = original.getParentFile();
String name = original.getName();
@@ -282,8 +298,8 @@ public class OmFileHelper {
}
return new File(parent, name + suffix + ext);
}
-
- //FIXME need to be generalized
+
+ // FIXME need to be generalized
public static File getNewFile(File dir, String name, String ext) throws
IOException {
File f = new File(dir, name + ext);
int recursiveNumber = 0;
@@ -293,7 +309,7 @@ public class OmFileHelper {
f.createNewFile();
return f;
}
-
+
public static File getNewDir(File dir, String name) throws IOException {
File f = new File(dir, name);
String baseName = f.getCanonicalPath();
@@ -305,11 +321,11 @@ public class OmFileHelper {
f.mkdir();
return f;
}
-
+
public static String getHumanSize(File dir) {
return getHumanSize(getSize(dir));
}
-
+
public static String getHumanSize(long size) {
if(size <= 0) return "0";
final String[] units = new String[] { "B", "KB", "MB", "GB",
"TB" };
@@ -323,14 +339,14 @@ public class OmFileHelper {
size = dir.length();
} else {
File[] subFiles = dir.listFiles();
-
+
for (File file : subFiles) {
if (file.isFile()) {
size += file.length();
} else {
size += getSize(file);
}
-
+
}
}
return size;
@@ -339,7 +355,7 @@ public class OmFileHelper {
public static void copyFile(String sourceFile, String targetFile)
throws IOException {
FileHelper.copy(new File(sourceFile), new File(targetFile));
}
-
+
public static void copyFile(File f1, OutputStream out) throws
IOException {
try (InputStream in = new FileInputStream(f1)) {
FileHelper.copy(in, out);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
Sun Oct 9 08:47:33 2016
@@ -20,21 +20,30 @@ package org.apache.openmeetings.web.admi
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import static org.apache.openmeetings.util.OmFileHelper.getGroupLogo;
+import static
org.apache.openmeetings.web.util.GroupLogoResourceReference.getUrl;
+import java.io.File;
+
+import org.apache.openmeetings.core.converter.GenerateImage;
import org.apache.openmeetings.db.dao.user.GroupDao;
import org.apache.openmeetings.db.dao.user.GroupUserDao;
import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.util.StoredFile;
import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.admin.AdminUserChoiceProvider;
-import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.common.UploadableImagePanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
+import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.NumberTextField;
import org.apache.wicket.markup.html.form.RequiredTextField;
+import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
@@ -43,8 +52,13 @@ import org.wicketstuff.select2.Select2Ch
public class GroupForm extends AdminBaseForm<Group> {
private static final long serialVersionUID = 1L;
private GroupUsersPanel usersPanel;
- private WebMarkupContainer groupList;
- private Select2Choice<User> userToadd = null;
+ private final WebMarkupContainer groupList;
+ private final Select2Choice<User> userToadd;
+ private final NumberTextField<Integer> maxFilesSize = new
NumberTextField<>("maxFilesSize");
+ private final NumberTextField<Integer> maxRecordingsSize = new
NumberTextField<>("maxRecordingsSize");
+ private final NumberTextField<Integer> maxRooms = new
NumberTextField<>("maxRooms");
+ private final NumberTextField<Integer> recordingTtl = new
NumberTextField<>("recordingTtl");
+ private final NumberTextField<Integer> reminderDays = new
NumberTextField<>("reminderDays");
static String formatUser(User choice) {
return String.format("%s [%s %s]", choice.getLogin(),
choice.getFirstname(), choice.getLastname());
@@ -55,7 +69,6 @@ public class GroupForm extends AdminBase
this.groupList = groupList;
setOutputMarkupId(true);
- add(new
RequiredTextField<String>("name").setLabel(Model.of(Application.getString(165))));
usersPanel = new GroupUsersPanel("users", getGroupId());
add(usersPanel);
@@ -99,10 +112,59 @@ public class GroupForm extends AdminBase
// event and throttle it down to once per second
add(new AjaxFormValidatingBehavior("keydown",
Duration.ONE_SECOND));
}
-
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new
RequiredTextField<String>("name").setLabel(Model.of(getString("165"))));
+ add(new UploadableImagePanel("logo") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected String getImageUrl() {
+ return getUrl(getRequestCycle(),
GroupForm.this.getModelObject().getId());
+ }
+
+ @Override
+ protected void processImage(StoredFile sf, File f)
throws Exception {
+ getBean(GenerateImage.class).resize(f,
getGroupLogo(GroupForm.this.getModelObject().getId(), false), null, 23);
+ }
+
+ @Override
+ protected String getTitle() {
+ return getString("admin.group.form.logo");
+ }
+ });
+ add(new
TextField<String>("tag").setLabel(Model.of(getString("admin.group.form.tag"))));
+ add(new AjaxCheckBox("limited") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ target.add(
+
maxFilesSize.setEnabled(getModelObject())
+ ,
maxRecordingsSize.setEnabled(getModelObject())
+ , maxRooms.setEnabled(getModelObject())
+ ,
recordingTtl.setEnabled(getModelObject())
+ ,
reminderDays.setEnabled(getModelObject())
+ );
+ }
+ }.setLabel(Model.of(getString("admin.group.form.limited"))));
+
add(maxFilesSize.setLabel(Model.of(getString("admin.group.form.maxFilesSize"))).setEnabled(false).setOutputMarkupId(true));
+
add(maxRecordingsSize.setLabel(Model.of(getString("admin.group.form.maxRecordingsSize"))).setEnabled(false).setOutputMarkupId(true));
+
add(maxRooms.setLabel(Model.of(getString("admin.group.form.maxRooms"))).setEnabled(false).setOutputMarkupId(true));
+
add(recordingTtl.setLabel(Model.of(getString("admin.group.form.recordingTtl"))).setEnabled(false).setOutputMarkupId(true));
+
add(reminderDays.setLabel(Model.of(getString("admin.group.form.reminderDays"))).setEnabled(false).setOutputMarkupId(true));
+ }
+
public void updateView(AjaxRequestTarget target) {
userToadd.setModelObject(null);
usersPanel.update(getGroupId());
+ maxFilesSize.setEnabled(getModelObject().isLimited());
+ maxRecordingsSize.setEnabled(getModelObject().isLimited());
+ maxRooms.setEnabled(getModelObject().isLimited());
+ recordingTtl.setEnabled(getModelObject().isLimited());
+ reminderDays.setEnabled(getModelObject().isLimited());
target.add(this, groupList);
target.appendJavaScript("groupsInit();");
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
Sun Oct 9 08:47:33 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,11 +27,11 @@
<th class="ui-widget-header"
style="width: 34px; max-width: 34px; overflow: hidden;"
wicket:message="title:98"><wicket:message key="98" /></th>
<th class="ui-widget-header"
style="width: 360px"><wicket:message key="177" /></th>
<th class="ui-widget-header"
style="width: 34px"><wicket:message key="275" /></th>
- </tr>
+ </tr>
</table>
- <div class="tableWrapper" style="width: 460px; height:
460px;">
- <table class="adminListTable" style="min-width:
440px; max-width: 440px">
- <tbody>
+ <div class="tableWrapper" style="width: 460px; height:
250px;">
+ <table class="adminListTable" style="min-width:
440px; max-width: 440px">
+ <tbody>
<tr wicket:id="userList"
class="ui-widget-content">
<td style="width:
34px"><input type="checkbox" wicket:id="isModerator"/></td>
<td style="width:
360px"><div style="width: 360px"><span wicket:id="label"></span></div></td>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
Sun Oct 9 08:47:33 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -59,11 +59,35 @@
<label><wicket:message key="171" /></label><input type="text" wicket:id="name"
/>
</div>
<div
class="formelement">
+
<label><wicket:message key="admin.group.form.logo" /></label><div
wicket:id="logo" class="input"></div>
+ </div>
+ <div
class="formelement">
+
<label><wicket:message key="admin.group.form.tag" /></label><input type="text"
wicket:id="tag" />
+ </div>
+ <div
class="formelement">
<label
style="font-weight: bold;"><wicket:message key="178" /></label><div
class="om-select2"><select wicket:id="user2add" class="input"></select></div>
</div>
<div
class="formelement">
<div
wicket:id="users"></div>
</div>
+ <div
class="formelement">
+
<label><wicket:message key="admin.group.form.limited" /></label><input
type="checkbox" wicket:id="limited" />
+ </div>
+ <div
class="formelement">
+
<label><wicket:message key="admin.group.form.maxFilesSize" /></label><input
type="number" wicket:id="maxFilesSize" /><wicket:message key="network.test.mb"/>
+ </div>
+ <div
class="formelement">
+
<label><wicket:message key="admin.group.form.maxRecordingsSize"
/></label><input type="number" wicket:id="maxRecordingsSize" /><wicket:message
key="network.test.mb"/>
+ </div>
+ <div
class="formelement">
+
<label><wicket:message key="admin.group.form.maxRooms" /></label><input
type="number" wicket:id="maxRooms" />
+ </div>
+ <div
class="formelement">
+
<label><wicket:message key="admin.group.form.recordingTtl" /></label><input
type="number" wicket:id="recordingTtl" /><wicket:message
key="admin.group.form.days"/>
+ </div>
+ <div
class="formelement">
+
<label><wicket:message key="admin.group.form.maxFilesSize" /></label><input
type="number" wicket:id="reminderDays" /><wicket:message
key="admin.group.form.days"/>
+ </div>
</fieldset>
</div>
</form>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
Sun Oct 9 08:47:33 2016
@@ -276,10 +276,10 @@ public class RoomForm extends AdminBaseF
}
}).setOutputMarkupId(true));
- add(new CheckBox("moderated"));
+ add(new CheckBox("moderated"));
add(new TextField<String>("confno").setEnabled(false));
- add(pin = new TextField<String>("pin"));
+ add(pin = new TextField<>("pin"));
pin.setEnabled(room.isSipEnabled());
add(new TextField<String>("ownerId").setEnabled(false));
add(new AjaxCheckBox("sipEnabled") {
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Sun Oct 9 08:47:33 2016
@@ -66,6 +66,7 @@ import org.apache.openmeetings.web.user.
import org.apache.openmeetings.web.user.record.JpgRecordingResourceReference;
import org.apache.openmeetings.web.user.record.Mp4RecordingResourceReference;
import org.apache.openmeetings.web.user.record.OggRecordingResourceReference;
+import org.apache.openmeetings.web.util.GroupLogoResourceReference;
import org.apache.openmeetings.web.util.ProfileImageResourceReference;
import org.apache.openmeetings.web.util.UserDashboardPersister;
import org.apache.wicket.Localizer;
@@ -154,6 +155,7 @@ public class Application extends Authent
mountResource("/recordings/ogg/${id}", new
OggRecordingResourceReference());
mountResource("/recordings/jpg/${id}", new
JpgRecordingResourceReference()); //should be in sync with VideoPlayer
mountResource("/profile/${id}", new
ProfileImageResourceReference());
+ mountResource("/group/${id}", new GroupLogoResourceReference());
}
private static class NoVersionMapper extends MountedMapper {
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1952,4 +1952,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1953,4 +1953,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1953,4 +1953,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1953,4 +1953,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1953,4 +1953,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1953,4 +1953,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1963,4 +1963,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1953,4 +1953,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1947,4 +1947,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1953,4 +1953,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1953,4 +1953,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1919,4 +1919,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1953,4 +1953,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1941,4 +1941,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1953,4 +1953,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1953,4 +1953,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1953,4 +1953,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1955,4 +1955,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1953,4 +1953,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1953,4 +1953,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1763946&r1=1763945&r2=1763946&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
Sun Oct 9 08:47:33 2016
@@ -1953,4 +1953,13 @@
<entry key="network.test.upl.speed">Upload speed</entry>
<entry key="access.denied.header">Access denied. You are not authorized
to perform this action.</entry>
<entry key="save.success">Saved successfully</entry>
+ <entry key="admin.group.form.logo">Logo</entry>
+ <entry key="admin.group.form.tag">Tag</entry>
+ <entry key="admin.group.form.limited">Limits enabled</entry>
+ <entry key="admin.group.form.maxFilesSize">Maximum files size</entry>
+ <entry key="admin.group.form.maxRecordingsSize">Maximum recordings
size</entry>
+ <entry key="admin.group.form.maxRooms">Maximum room number</entry>
+ <entry key="admin.group.form.recordingTtl">Recordings expire in</entry>
+ <entry key="admin.group.form.reminderDays">Expire reminder sent
in</entry>
+ <entry key="admin.group.form.days">days</entry>
</properties>
