You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/08/01 03:29:28 UTC
[1/2] openmeetings git commit: no jira: Logos by Kristopher Herrick
were added
Repository: openmeetings
Updated Branches:
refs/heads/master fdcce6a20 -> 3c020e88e
no jira: Logos by Kristopher Herrick were added
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/c90d376d
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c90d376d
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c90d376d
Branch: refs/heads/master
Commit: c90d376dd315b731edace8b693e5522a2da85f55
Parents: 7e29189
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Aug 1 10:28:32 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Aug 1 10:28:53 2017 +0700
----------------------------------------------------------------------
.../resources/images/logos/logo_om_big7.png | Bin 0 -> 922474 bytes
.../resources/images/logos/logo_om_small11.png | Bin 0 -> 698634 bytes
.../src/site/xdoc/CallForLogo.xml | 24 +++++++++++++++++++
3 files changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c90d376d/openmeetings-server/src/site/resources/images/logos/logo_om_big7.png
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/resources/images/logos/logo_om_big7.png b/openmeetings-server/src/site/resources/images/logos/logo_om_big7.png
new file mode 100644
index 0000000..48614db
Binary files /dev/null and b/openmeetings-server/src/site/resources/images/logos/logo_om_big7.png differ
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c90d376d/openmeetings-server/src/site/resources/images/logos/logo_om_small11.png
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/resources/images/logos/logo_om_small11.png b/openmeetings-server/src/site/resources/images/logos/logo_om_small11.png
new file mode 100644
index 0000000..e610112
Binary files /dev/null and b/openmeetings-server/src/site/resources/images/logos/logo_om_small11.png differ
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c90d376d/openmeetings-server/src/site/xdoc/CallForLogo.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/CallForLogo.xml b/openmeetings-server/src/site/xdoc/CallForLogo.xml
index 212bc28..6dca4f2 100644
--- a/openmeetings-server/src/site/xdoc/CallForLogo.xml
+++ b/openmeetings-server/src/site/xdoc/CallForLogo.xml
@@ -126,6 +126,18 @@
</tr>
</table>
</li>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-big" src="images/logos/logo_om_big7.png" alt="Apache OpenMeetings"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoBig($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Kristopher Herrick</td>
+ </tr>
+ </table>
+ </li>
</ol>
<h3>Square version</h3>
<ol>
@@ -225,6 +237,18 @@
</tr>
</table>
</li>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-square" src="images/logos/logo_om_small11.png" alt="Square version" width="50"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Kristopher Herrick</td>
+ </tr>
+ </table>
+ </li>
</ol>
</section>
</body>
[2/2] openmeetings git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/openmeetings
Posted by so...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/openmeetings
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/3c020e88
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/3c020e88
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/3c020e88
Branch: refs/heads/master
Commit: 3c020e88ed6e6b2eec3f4aa3a832b5e83c38a5ee
Parents: c90d376 fdcce6a
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Aug 1 10:29:12 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Aug 1 10:29:12 2017 +0700
----------------------------------------------------------------------
.../core/data/conference/RoomManager.java | 6 +-
.../remote/ISlaveHTTPConnectionManager.java | 25 --
.../openmeetings/core/remote/MobileService.java | 8 +-
.../core/remote/RecordingService.java | 2 -
.../core/remote/ScopeApplicationAdapter.java | 22 +-
.../openmeetings/core/session/ServerUtil.java | 82 -----
.../core/session/SessionManager.java | 240 ++++-----------
.../core/session/store/DatabaseStore.java | 142 ---------
.../core/session/store/HashMapStore.java | 216 -------------
.../session/store/IClientPersistenceStore.java | 136 ---------
.../openmeetings/core/util/IClientUtil.java | 8 +-
.../openmeetings/core/util/RoomHelper.java | 4 +-
.../org/apache/openmeetings/IApplication.java | 15 +-
.../db/dao/basic/ConfigurationDao.java | 14 +
.../openmeetings/db/dao/room/ClientDao.java | 142 ---------
.../openmeetings/db/dao/room/RoomDao.java | 3 +-
.../db/dao/server/ISessionManager.java | 103 ++-----
.../openmeetings/db/dao/server/ServerDao.java | 222 --------------
.../db/dao/server/SessiondataDao.java | 2 +-
.../openmeetings/db/dao/user/IUserManager.java | 5 +-
.../db/dto/server/ClientSessionInfo.java | 50 ---
.../openmeetings/db/dto/server/ServerDTO.java | 181 -----------
.../openmeetings/db/entity/basic/Client.java | 60 ++--
.../openmeetings/db/entity/basic/IClient.java | 2 +
.../db/entity/room/StreamClient.java | 201 +-----------
.../openmeetings/db/entity/server/Server.java | 304 -------------------
.../openmeetings/backup/BackupExport.java | 9 -
.../openmeetings/backup/BackupImport.java | 18 +-
.../installation/ImportInitvalues.java | 3 +-
.../src/site/resources/images/cluster1.png | Bin 51076 -> 0 bytes
.../src/site/xdoc/Clustering.xml | 68 +----
.../service/quartz/scheduler/CleanupJob.java | 6 +-
.../openmeetings/service/user/UserManager.java | 6 +-
openmeetings-web/pom.xml | 5 +
.../web/admin/connection/ConnectionsPanel.java | 10 +-
.../openmeetings/web/admin/rooms/RoomForm.java | 4 +-
.../web/admin/servers/ServerForm.java | 140 ---------
.../web/admin/servers/ServersPanel.html | 103 -------
.../web/admin/servers/ServersPanel.java | 95 ------
.../openmeetings/web/app/Application.java | 174 ++++++++---
.../openmeetings/web/room/RoomBroadcaster.java | 10 +-
.../apache/openmeetings/web/room/RoomPanel.java | 23 +-
.../apache/openmeetings/web/room/SwfPanel.java | 51 ++++
.../web/room/menu/RoomMenuPanel.java | 4 +-
.../web/room/menu/StartSharingButton.java | 4 +-
.../web/room/sidebar/RoomSidebar.java | 12 +-
.../openmeetings/web/util/OmUrlFragment.java | 9 -
.../classes/META-INF/db2_persistence.xml | 3 +-
.../classes/META-INF/derby_persistence.xml | 2 -
.../classes/META-INF/mssql_persistence.xml | 3 +-
.../classes/META-INF/mysql_persistence.xml | 3 +-
.../classes/META-INF/oracle_persistence.xml | 3 +-
.../classes/META-INF/postgresql_persistence.xml | 3 +-
.../WEB-INF/classes/applicationContext.xml | 28 +-
.../main/webapp/WEB-INF/classes/cxf-servlet.xml | 3 -
.../main/webapp/WEB-INF/classes/hazelcast.xml | 32 ++
.../webapp/WEB-INF/classes/logback-config.xml | 7 +-
.../webapp/WEB-INF/classes/rebel-remote.xml | 6 +-
.../src/main/webapp/WEB-INF/classes/rebel.xml | 6 +-
.../test/session/TestDbSession.java | 179 -----------
.../test/session/TestDbSessionGetRoomIds.java | 92 ------
.../test/session/TestHashMapSession.java | 73 -----
.../openmeetings/webservice/RoomWebService.java | 4 +-
.../webservice/ServerWebService.java | 171 -----------
.../openmeetings/webservice/UserWebService.java | 142 +++++----
.../webservice/cluster/RestClient.java | 196 ------------
.../cluster/SlaveHTTPConnectionManager.java | 99 ------
.../webservice/cluster/UserService.java | 158 ----------
68 files changed, 555 insertions(+), 3607 deletions(-)
----------------------------------------------------------------------