Bug 21782: Release team 18.11 in About

[1] Moved the (usual) 18.05 positions to the Dev section.
[2] Added the 18.11 positions to the Release team section.

Test plan:
[1] Look at About/Koha team.
[2] Compare with roles 18.05 and roles 18.11.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 348b925..b718dfe 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -397,56 +397,67 @@
                 <li><a href="http://www.ashs.school.nz/">Albany Senior High School</a>, Auckland, New Zealand (OPAC 'star-ratings' sponsorship)</li>
             </ul>
 
-            <h2>Koha 18.05 release team</h2>
+            <h2>Koha 18.11 release team</h2>
             <ul>
                 <li><strong>Release manager:</strong>
-                    <a href="https://www.openhub.net/p/koha/contributors/6618545125093">Jonathan Druart</a>
-                </li>
-                <li><strong>Release manager assistant:</strong>
                     <a href="https://www.openhub.net/p/koha/contributors/6620692886191">Nick Clemens</a>
                 </li>
-                <li><strong>Documentation Team:</strong>
+                <li><strong>Release manager assistants:</strong>
+                    <ul>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi</a></li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6618545125093">Jonathan Druart</a></li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544661344">Brendan Gallagher</a></li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6620692261494">Kyle Hall</a></li>
+                    </ul>
+                </li>
+                <li><strong>Documentation team:</strong>
                     <ul>
-                    <li>Lee Jamison</li>
-                    <li>David Nind</li>
-                    <li>Caroline Cyr La Rose</li>
+                        <li>Caroline Cyr La Rose</li>
+                        <li>Lee Jamison</li>
+                        <li>David Nind</li>
                     </ul>
                 </li>
                 <li><strong>Translation manager:</strong>
-                    <a href="https://www.openhub.net/p/koha/contributors/6618544839606">Bernardo González Kriegel</a></li>
+                    <a href="https://www.openhub.net/p/koha/contributors/6618544839606">Bernardo González Kriegel</a>
+                </li>
                 <li><strong>Quality assurance manager:</strong>
                     <a href="https://www.openhub.net/p/koha/contributors/6618544670742">Katrin Fischer</a>
                 </li>
                 <li><strong>Quality assurance team:</strong>
                     <ul>
-                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi</a></li>
                         <li>Alex Arnaud</li>
-                        <li><a href="https://www.openhub.net/p/koha/contributors/6620692886191">Nick Clemens</a></li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi</a></li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544609030">Chris Cormack</a></li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6618545125093">Jonathan Druart</a></li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6620692261494">Kyle Hall</a></li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6620692419690">Julian Maurice</a></li>
                         <li>Josef Moravec</li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544785220">Martin Renvoize</a></li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6618544727712">Marcel de Rooy</a></li>
                     </ul>
                 </li>
                 <li><strong>Release maintainers:</strong>
                     <ul>
-                        <li><a href="https://www.openhub.net/p/koha/contributors/6620692886191">Nick Clemens</a> (17.11)</li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544785220">Martin Renvoize</a> (18.05)</li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6620692831733">Fridolin Somers</a> (17.11)</li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6620692831733">Fridolin Somers</a> (17.05)</li>
-                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544609030">Chris Cormack</a> (16.11)</li>
                     </ul>
                 </li>
                 <li><strong>Packaging manager:</strong>
-                    <a href="https://www.openhub.net/p/koha/contributors/6620692605913">Mirko Tietgen</a>
+                    <ul>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6620692605913">Mirko Tietgen</a></li>
+                        <li><a href="https://www.openhub.net/accounts/kohaaloha">Mason James</a> (Assistant)</li>
+                    </ul>
                 </li>
                 <li><strong>Jenkins maintainer:</strong>
                     <a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi</a>
                 </li>
                 <li><strong>Bug wranglers:</strong>
                     <ul>
-                        <li>Alex Buckley</li>
+                        <li>Indranil Das Gupta</li>
                         <li>Claire Gravely</li>
+                        <li>Amit Gupta</li>
                         <li>Jon Knight</li>
-                        <li><a href="https://www.openhub.net/p/koha/contributors/6618545408147">Marc Véron</a></li>
                     </ul>
                 </li>
             </ul>
@@ -469,9 +480,9 @@
                 <li><a href="https://www.openhub.net/p/koha/contributors/6620692181851">Nahuel Angelinetti</a></li>
                 <li>Nuño López Ansótegui</li>
                 <li>Dimitris Antonakis</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi (3.18 - 3.22 Release Manager; 3.12 Release Maintainer; 16.05 - 17.11 QA Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi (3.18 - 3.22 Release Manager; 3.12 Release Maintainer; 16.05 - 18.05 QA Team Member)</a></li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6620692124662">Andrew Arensburger (the small and great C4::Context module)</a></li>
-                <li>Alex Arnaud</li>
+                <li>Alex Arnaud (18.05 QA Team Member)</li>
                 <li>Cori Lynn Arnold</li>
                 <li>Petter Goksøyr Åsen</li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6618544614259">Joe Atzberger</a></li>
@@ -524,18 +535,19 @@
                 <li>Pongtawat Chippimolchai</li>
                 <li>Barton Chittenden</li>
                 <li>Koha SAB CINECA</li>
-                <li>Nick Clemens (16.11 - 17.11 QA Team Member)</li>
+                <li>Nick Clemens (16.11 - 18.05 QA Team Member; 17.11 Release Maintainer)</li>
                 <li>Garry Collum</li>
                 <li>David Cook</li>
                 <li>John Copeland</li>
                 <li>Charlotte Cordwell</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544609030">Chris Cormack (1.x, 3.4 and 3.6 Release Manager; 3.8, 3.10, 3.18 and 3.20 Release Maintainer; 3.2 Translation Manager; 3.14 QA Team Member; 17.05 Documentation Manager; 17.11 Documentation Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544609030">Chris Cormack (1.x, 3.4 and 3.6 Release Manager; 3.8, 3.10, 3.18, 3.20 and 16.11 Release Maintainer; 3.2 Translation Manager; 3.14 QA Team Member; 17.05 Documentation Manager; 17.11 Documentation Team Member)</a></li>
                 <li>Jeremy Crabtree</li>
                 <li>Bonnie Crawford</li>
                 <li>Samuel Crosby</li>
                 <li>Christophe Croullebois</li>
                 <li>Olivier Crouzet</li>
                 <li>Nate Curulla</li>
+                <li>Caroline Cyr La Rose (18.05 Documentation Team Member)</li>
                 <li>Vincent Danjean</li>
                 <li>Hugh Davenport</li>
                 <li>Elliott Davis (3.12 QA Team Member)</li>
@@ -548,7 +560,7 @@
                 <li>Leire Diez</li>
                 <li>Yarik</li>
                 <li>Rocio Dressler</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618545125093">Jonathan Druart (3.8 - 17.05 QA Team Member; 17.11 Release Manager)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618545125093">Jonathan Druart (3.8 - 17.05 QA Team Member; 17.11 - 18.05 Release Manager)</a></li>
                 <li>Serhij Dubyk</li>
                 <li>Yohann Dufour</li>
                 <li>Thomas Dukleth (MARC Frameworks Maintenance)</li>
@@ -573,7 +585,7 @@
                 <li>Vitor Fernandes</li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6618544609053">Joshua Ferraro (3.0 Release Manager and Translation Manager)</a></li>
                 <li>Julian Fiol</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544670742">Katrin Fischer (3.12 - 16.11 QA Manager, 16.11 Release Maintainer, 17.11 Documentation Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544670742">Katrin Fischer (3.12 - 16.11 QA Manager, 16.11 Release Maintainer, 17.11 Documentation Team Member, 18.05 QA Manager)</a></li>
                 <li>Connor Fraser</li>
                 <li>Clay Fouts</li>
                 <li>Brendon Ford</li>
@@ -589,7 +601,7 @@
                 <li>Mark Gavillet</li>
                 <li>Daniel Kahn Gillmor</li>
                 <li>David Goldfein</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544839606">Bernardo González Kriegel (3.14 - 17.11 Translation Manager; 3.10 Release Maintainer)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544839606">Bernardo González Kriegel (3.14 - 18.05 Translation Manager; 3.10 Release Maintainer)</a></li>
                 <li>Caitlin Goodger</li>
                 <li>Isobel Graham</li>
                 <li>Claire Gravely</li>
@@ -603,7 +615,7 @@
                 <li>Michael Hafen</li>
                 <li>Margaret Hade</li>
                 <li>Christopher Hall (3.8 Release Maintainer)</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6620692261494">Kyle Hall (3.8 Release Maintainer; 3.14 - 17.11 QA Team Member; 16.11 - 17.05 Release Manager)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6620692261494">Kyle Hall (3.8 Release Maintainer; 3.14 - 18.05 QA Team Member; 16.11 - 17.05 Release Manager)</a></li>
                 <li>Sean Hamlin</li>
                 <li>Tim Hannah</li>
                 <li>Mike Hansen</li>
@@ -634,7 +646,7 @@
                 <li>Rolando Isidoro</li>
                 <li>Te Rauhina Jackson</li>
                 <li>Cory Jaeger</li>
-                <li>Lee Jamison</li>
+                <li>Lee Jamison (18.05 Documentation Team Member)</li>
                 <li>Srdjan Jankovic</li>
                 <li>Philippe Jaillon</li>
                 <li><a href="https://www.openhub.net/accounts/kohaaloha">Mason James (3.10 - 3.14 QA Team Member, 3.16, 16.05 Release Maintainer)</a></li>
@@ -680,7 +692,7 @@
                 <li>Jesse Maseto</li>
                 <li>Frère Sébastien Marie</li>
                 <li>Ricardo Dias Marques</li>
-                <li>Julian Maurice (3.18, 17.05 - 17.11 QA Team Member; 3.22 Release Maintainer)</li>
+                <li>Julian Maurice (3.18, 17.05 - 18.05 QA Team Member; 3.22 Release Maintainer)</li>
                 <li>Remi Mayrand-Provencher</li>
                 <li>Brig C. McCoy</li>
                 <li>Grace McKenzie</li>
@@ -697,7 +709,7 @@
                 <li>Jono Mingard</li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6618544607803">Andrew Moore</a></li>
                 <li>Francesca Moore</li>
-                <li>Josef Moravec</li>
+                <li>Josef Moravec (18.05 QA Team Member)</li>
                 <li>Sharon Moreland</li>
                 <li>Nicolas Morin</li>
                 <li>Mike Mylonas</li>
@@ -706,6 +718,7 @@
                 <li>Nazlı</li>
                 <li>Joy Nelson</li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6618544615991">Chris Nighswonger (3.2 - 3.6 Release Maintainer)</a></li>
+                <li>David Nind (18.05 Documentation Team Member)</li>
                 <li>Brian Norris</li>
                 <li>Duy Tinh Nguyen</li>
                 <li>Simith D'Oliveira</li>
@@ -738,7 +751,7 @@
                 <li>Abby Robertson</li>
                 <li>Waylon Robertson</li>
                 <li>Benjamin Rokseth</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544727712">Marcel de Rooy (3.8 - 17.11 QA Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544727712">Marcel de Rooy (3.8 - 18.05 QA Team Member)</a></li>
                 <li>Andreas Roussos</li>
                 <li>Salvador Zaragoza Rubio</li>
                 <li>Mathieu Saby</li>
@@ -780,7 +793,7 @@
                 <li><a href="https://www.openhub.net/p/koha/contributors/6618544609107">Finlay Thompson</a></li>
                 <li>Peggy Thrasher</li>
                 <li>Fabio Tiana</li>
-                <li>Mirko Tietgen (16.11 - 17.11 Packaging Manager)</li>
+                <li>Mirko Tietgen (16.11 - 18.05 Packaging Manager)</li>
                 <li>Mark Tompsett</li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6620692101577">Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</a></li>
                 <li>Bruno Toumi</li>