This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch release-6-2-0
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 31686b29d3b90c196740bc3179e9cc569ec13201
Merge: bdb0760 b25113a
Author: Sebastian Wagner <seba.wag...@gmail.com>
AuthorDate: Thu Oct 21 19:29:53 2021 +1300
Merge branch 'master' into release-6-2-0
.../installation/ImportInitvalues.java | 2 +-
openmeetings-server/pom.xml | 2 +-
.../src/site/markdown/LogoAndIcons.md | 28 ++++++
openmeetings-server/src/site/site.xml | 1 +
.../src/site/xdoc/WebappNamePath.xml | 7 --
.../openmeetings/util/OpenmeetingsVariables.java | 19 ++++
openmeetings-web/src/main/front/main/src/index.js | 7 ++
.../src/main/front/main/src/omutils.js | 21 ++--
.../apache/openmeetings/web/pages/BasePage.html | 30 ++++++
.../src/main/webapp/css/raw-general.css | 7 +-
openmeetings-web/src/main/webapp/css/raw-menu.css | 1 +
openmeetings-web/src/main/webapp/css/raw-room.css | 2 +-
.../src/main/webapp/css/raw-variables.css | 2 +-
.../main/webapp/images/icons/apple-icon-180.png | Bin 0 -> 10696 bytes
.../webapp/images/icons/apple-splash-1125-2436.jpg | Bin 0 -> 66463 bytes
.../webapp/images/icons/apple-splash-1136-640.jpg | Bin 0 -> 24945 bytes
.../webapp/images/icons/apple-splash-1170-2532.jpg | Bin 0 -> 69906 bytes
.../webapp/images/icons/apple-splash-1242-2208.jpg | Bin 0 -> 72120 bytes
.../webapp/images/icons/apple-splash-1242-2688.jpg | Bin 0 -> 75659 bytes
.../webapp/images/icons/apple-splash-1284-2778.jpg | Bin 0 -> 78823 bytes
.../webapp/images/icons/apple-splash-1334-750.jpg | Bin 0 -> 31010 bytes
.../webapp/images/icons/apple-splash-1536-2048.jpg | Bin 0 -> 88952 bytes
.../webapp/images/icons/apple-splash-1620-2160.jpg | Bin 0 -> 95661 bytes
.../webapp/images/icons/apple-splash-1668-2224.jpg | Bin 0 -> 99240 bytes
.../webapp/images/icons/apple-splash-1668-2388.jpg | Bin 0 -> 101273 bytes
.../webapp/images/icons/apple-splash-1792-828.jpg | Bin 0 -> 32864 bytes
.../webapp/images/icons/apple-splash-2048-1536.jpg | Bin 0 -> 83104 bytes
.../webapp/images/icons/apple-splash-2048-2732.jpg | Bin 0 -> 130068 bytes
.../webapp/images/icons/apple-splash-2160-1620.jpg | Bin 0 -> 89441 bytes
.../webapp/images/icons/apple-splash-2208-1242.jpg | Bin 0 -> 60178 bytes
.../webapp/images/icons/apple-splash-2224-1668.jpg | Bin 0 -> 92538 bytes
.../webapp/images/icons/apple-splash-2388-1668.jpg | Bin 0 -> 92578 bytes
.../webapp/images/icons/apple-splash-2436-1125.jpg | Bin 0 -> 50367 bytes
.../webapp/images/icons/apple-splash-2532-1170.jpg | Bin 0 -> 53274 bytes
.../webapp/images/icons/apple-splash-2688-1242.jpg | Bin 0 -> 57573 bytes
.../webapp/images/icons/apple-splash-2732-2048.jpg | Bin 0 -> 121595 bytes
.../webapp/images/icons/apple-splash-2778-1284.jpg | Bin 0 -> 60820 bytes
.../webapp/images/icons/apple-splash-640-1136.jpg | Bin 0 -> 30165 bytes
.../webapp/images/icons/apple-splash-750-1334.jpg | Bin 0 -> 37214 bytes
.../webapp/images/icons/apple-splash-828-1792.jpg | Bin 0 -> 44404 bytes
.../images/icons/manifest-icon-192.maskable.png | Bin 0 -> 11489 bytes
.../images/icons/manifest-icon-512.maskable.png | Bin 0 -> 40763 bytes
.../webapp/images/icons/openmeetings-logo-icon.svg | 110 +++++++++++++++++++++
.../openmeetings/webservice/InfoWebService.java | 46 ++++++++-
pom.xml | 18 ++--
45 files changed, 274 insertions(+), 29 deletions(-)
