You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2021/09/13 21:12:14 UTC

[openmeetings] branch master updated: OPENMEETINGS-2420 Add both release and other news section for Node.js and OpenAPI swagger doc link.

This is an automated email from the ASF dual-hosted git repository.

sebawagner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 9756d54  OPENMEETINGS-2420 Add both release and other news section for Node.js and OpenAPI swagger doc link.
     new 051dab4  Merge branch 'master' of github.com:apache/openmeetings
9756d54 is described below

commit 9756d54355b480a8646a69a8d22a7b21326bea1b
Author: Sebastian Wagner <se...@gmail.com>
AuthorDate: Tue Sep 14 09:02:06 2021 +1200

    OPENMEETINGS-2420 Add both release and other news section for Node.js and OpenAPI swagger doc link.
---
 openmeetings-server/src/site/xdoc/NewsArchive.xml  | 32 ----------------------
 openmeetings-server/src/site/xdoc/WebsiteGuide.xml |  2 +-
 openmeetings-server/src/site/xdoc/index.xml        | 32 +++++++++++++++++++++-
 3 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/openmeetings-server/src/site/xdoc/NewsArchive.xml b/openmeetings-server/src/site/xdoc/NewsArchive.xml
index 4aff2e6..3454de8 100644
--- a/openmeetings-server/src/site/xdoc/NewsArchive.xml
+++ b/openmeetings-server/src/site/xdoc/NewsArchive.xml
@@ -20,38 +20,6 @@
 	</properties>
 
 	<body>
-		<section name="Release 6.1.0">
-			<div class="bd-callout bd-callout-info">
-				<h4>Version 6.1.0 released!</h4>
-				<div>Release 6.1.0, provides following improvements:<br/>
-					This release provides WebRTC audio/video/screen-sharing in the Room<br/>
-
-					Stability:
-					<ul>
-						<li>Room is more stable</li>
-						<li>Screen sharing on Safari is fixed</li>
-						<li>Recording in interview room is fixed</li>
-					</ul>
-					UI:
-					<ul>
-						<li>OM theme can selected in Admin -&gt; Config</li>
-						<li>Configurable Extra menu is added to the rooms</li>
-						<li>Date/time picker is better localized</li>
-					</ul>
-					<br/>
-					Other fixes and improvements
-				</div>
-				<br/>
-
-				<span>
-					27 issues are fixed please check <br/>
-					<a href="https://www.apache.org/dist/openmeetings/6.1.0/CHANGELOG.md">CHANGELOG</a> and
-					<a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12312720&amp;version=12349533">Detailed list</a>
-				</span>
-				<span> See <a href="downloads.html">Downloads page</a>.</span>
-				<span class="date">(2021-07-20)</span>
-			</div>
-		</section>
 		<section name="Release 5.1.0">
 			<div class="bd-callout bd-callout-info">
 				<h4>Version 5.1.0 released!</h4>
diff --git a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
index 9f0cb77..b545910 100644
--- a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
+++ b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
@@ -53,7 +53,7 @@
 						To update the website you need to clone asf-site:<br />
 						<source><![CDATA[
 git clone https://github.com/apache/openmeetings-site.git site
-git checkout asf-site
+git checkout master
 						]]></source>
 						edit the files in the folder <tt>openmeetings-server/src/site</tt><br/>
 						then you run the command:
diff --git a/openmeetings-server/src/site/xdoc/index.xml b/openmeetings-server/src/site/xdoc/index.xml
index a3fa9a6..e6b14ad 100644
--- a/openmeetings-server/src/site/xdoc/index.xml
+++ b/openmeetings-server/src/site/xdoc/index.xml
@@ -69,7 +69,7 @@
 		</section>
 		<section name="News">
 			<div class="bd-callout bd-callout-danger">
-				<h4>OpenAPI, Swagger and Node.js integration</h4>
+				<div class="h4">OpenAPI, Swagger and Node.js integration</div>
 				<div>You can now use a community contributed Node.js module as well as use the OpenAPI Swagger Spec to make integration to OpenMeetings easier<br/><br/>
 					More information:
 					<ul>
@@ -83,6 +83,36 @@
 				<br/>
 				<span class="date">(2021-09-13)</span>
 			</div>
+			<div class="bd-callout bd-callout-danger">
+				<div class="h4">Version 6.1.0 released!</div>
+				<div>Release 6.1.0, provides following improvements:<br/>
+					This release provides WebRTC audio/video/screen-sharing in the Room<br/>
+
+					Stability:
+					<ul>
+						<li>Room is more stable</li>
+						<li>Screen sharing on Safari is fixed</li>
+						<li>Recording in interview room is fixed</li>
+					</ul>
+					UI:
+					<ul>
+						<li>OM theme can selected in Admin -&gt; Config</li>
+						<li>Configurable Extra menu is added to the rooms</li>
+						<li>Date/time picker is better localized</li>
+					</ul>
+					<br/>
+					Other fixes and improvements
+				</div>
+				<br/>
+
+				<span>
+					27 issues are fixed please check <br/>
+					<a href="https://www.apache.org/dist/openmeetings/6.1.0/CHANGELOG.md">CHANGELOG</a> and
+					<a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12312720&amp;version=12349533">Detailed list</a>
+				</span>
+				<span> See <a href="downloads.html">Downloads page</a>.</span>
+				<span class="date">(2021-07-20)</span>
+			</div>
 			<div class="bd-callout bd-callout-info">
 				<span class="date"><a href="NewsArchive.html">You can find older news here</a></span>
 			</div>