Merge pull request #29 from JiaoXianjun/master

Openwifi stand front page update

diff --git a/README.md b/README.md
index f9f2fce147b9a639c818ca61324c908e1e4ba912..75cbabf43a2e692098a9a28adfc6ac7f1b6ececb 100644 (file)
--- a/README.md
+++ b/README.md
@@ -72,6 +72,7 @@ new_this_year: |
     _What has happened in 2020 to your project? You can use HTML (p, ul, etc.)_
 
 layout: stand
+chatroom: _Room name in pentabarf_
 ---
 ```
 
@@ -83,13 +84,23 @@ You must provide a _title_ parameter in the front matter of your other pages; ot
 
 ## Chatroom functionality
 
+Each stand will have a dedicated chatroom, created based on the information in *pentabarf*. Your chat room name is the same name as the _room_ you are
+scheduled in in pentabarf.
+
+We have put the name of the chatroom as *chatroom* on all stands pages. _However, if you provided your own \_index.md file, you *must add this parameter*, otherwise your chatroom link will not be functional._ You cannot change this yourself.
+
+Each chatroom will have the two contacts listed in your submission (and who created an account in Pentabarf) as _moderator_. Additionally, all FOSDEM staff
+will be given the same role. Moderators can invite other moderators, but note that you require a Matrix account for this.
+
 ## Video
-No youtube
 
-video.fosdem.org
+Because of our strict security settings, you cannot embed video's from Youtube (or any other video hosting site) - only from video.fosdem.org.
+
+You can upload video's via [penta.fosdem.org](https://penta.fosdem.org), where everybody should have an account (if not, contact _stands\_at\_fosdem.org_). The exact process is not automated yet, so you will have to send an e-mail to _stands\_at\_fosdem.org_ and we will provide you with the upload link.
 
-upload via penta
+Upload the video, it will be converted by our system. Afterwards, you review and approve the video, which will then be live.
 
+You can embed the video; the links will be of the form _https://video.fosdem.org/2021/stands/\_chatroom\_name\_\_video1.mp4_.
 
 ## Technical details
 

diff --git a/content/stands/coderdojo_belgium.md b/content/stands/coderdojo_belgium.md
index 1ef8c7e4277077be0c5350b4ed0b3fff2642616c..bf64275e8da0ec3c513cb452e2c427f6047abace 100644 (file)
--- a/content/stands/coderdojo_belgium.md
+++ b/content/stands/coderdojo_belgium.md
@@ -17,4 +17,5 @@ themes:
 title: CoderDojo Belgium
 website: https://www.coderdojobelgium.be/en
 show_on_overview: true
+chatroom: coderdojo
 ---
\ No newline at end of file

diff --git a/content/stands/openmandriva.md b/content/stands/openmandriva.md
index cd5215626b4a3cfa474673426eda8dbeb359800b..381029b129a332668f81cf8c8396a35a6494489d 100644 (file)
--- a/content/stands/openmandriva.md
+++ b/content/stands/openmandriva.md
@@ -5,6 +5,7 @@ themes:
 website: https://openmandriva.org/
 layout: stand
 show_on_overview: true
+draft: true
 logo: stands/openmandriva/logo.png
 description: |
   OpenMandriva is a 100% community controlled Linux distribution.

diff --git a/content/stands/postgresql b/content/stands/postgresql
index 37cf702e65bd1e38fc6e383eff2205a19f666292..9c813d904b58d6ad820ebaf2c7527b63b1a33ec1 160000 (submodule)
--- a/content/stands/postgresql
+++ b/content/stands/postgresql
@@ -1 +1 @@
-Subproject commit 37cf702e65bd1e38fc6e383eff2205a19f666292
+Subproject commit 9c813d904b58d6ad820ebaf2c7527b63b1a33ec1

diff --git a/content/stands/sesame_discovery b/content/stands/sesame_discovery
index f5026c7025993da0f1d696404293906625b7c0f0..9c061cec03582bf813ed5d87b943d9ca18ead633 160000 (submodule)
--- a/content/stands/sesame_discovery
+++ b/content/stands/sesame_discovery
@@ -1 +1 @@
-Subproject commit f5026c7025993da0f1d696404293906625b7c0f0
+Subproject commit 9c061cec03582bf813ed5d87b943d9ca18ead633

diff --git a/content/stands/the_gnome_foundation b/content/stands/the_gnome_foundation
index 98dfd8738a1fb173d393518e5d5498c24878d68e..74b2a2a905434c6e7c7f817189def141d87bc984 160000 (submodule)
--- a/content/stands/the_gnome_foundation
+++ b/content/stands/the_gnome_foundation
@@ -1 +1 @@
-Subproject commit 98dfd8738a1fb173d393518e5d5498c24878d68e
+Subproject commit 74b2a2a905434c6e7c7f817189def141d87bc984

diff --git a/content/stands/thola___nesi.md b/content/stands/thola___nesi.md
index 0a6d4bf63daa4b501ca82fd260fdcf6da89c4fdf..fc117e18674fd25e0c089287121cfa25f2f8b78b 100644 (file)
--- a/content/stands/thola___nesi.md
+++ b/content/stands/thola___nesi.md
@@ -50,4 +50,5 @@ title: Thola / NESi
 website: https://thola.io
 show_on_overview: true
 chatroom: thola
+draft: true
 ---
\ No newline at end of file

diff --git a/static/stands/mautic b/static/stands/mautic
index f680ca556c64f2ba965957aeb903111baa29ef07..f9625070dac1bd7812e883d7241f5d6916ccf6b7 160000 (submodule)
--- a/static/stands/mautic
+++ b/static/stands/mautic
@@ -1 +1 @@
-Subproject commit f680ca556c64f2ba965957aeb903111baa29ef07
+Subproject commit f9625070dac1bd7812e883d7241f5d6916ccf6b7

diff --git a/static/stands/the_gnome_foundation b/static/stands/the_gnome_foundation
index 98dfd8738a1fb173d393518e5d5498c24878d68e..74b2a2a905434c6e7c7f817189def141d87bc984 160000 (submodule)
--- a/static/stands/the_gnome_foundation
+++ b/static/stands/the_gnome_foundation
@@ -1 +1 @@
-Subproject commit 98dfd8738a1fb173d393518e5d5498c24878d68e
+Subproject commit 74b2a2a905434c6e7c7f817189def141d87bc984