Commit a7104591 authored by Laurence Sebastian Bowes's avatar Laurence Sebastian Bowes

Merge branch 'beta' into 'sucs-site'

Beta

See merge request sucssite/sucs-site!113
parents 37529fc8 5f4e17eb
Pipeline #588 passed with stages
in 6 minutes and 18 seconds
......@@ -30,6 +30,7 @@ js-syntax-check:
- apt-get install -y curl gnupg
- curl -sL https://deb.nodesource.com/setup_8.x | bash -
- apt-get install -y nodejs
- apt-get install -y npm
- npm install -g jshint
- find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
......
......@@ -4,9 +4,9 @@
<p>The following people were elected to the following posts in accordance with the <a href="../About/Constitution">SUCS constitution</a>.</p>
<ul class="boxes">
<li>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/vectre.png" width="100" />
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/colours.png" width="100" />
<br />
<strong>President</strong><br />Alexander Moras (~vectre)</div>
<strong>President</strong><br />Declan Morbey (~colours)</div>
</li>
<li>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/elbows.png" width="100" />
......@@ -14,14 +14,18 @@
<strong>Treasurer</strong><br />Laurence Sebastian Bowes (~elbows)</div>
</li>
<li>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/xray_effect.png" width="100" />
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/mr_miyagi_420.png" width="100" />
<br />
<strong>Secretary</strong><br />Ryan Williams (~xray_effect)</div>
<strong>Secretary</strong><br />Rafal Gajewski (~mr_miyagi_420)</div>
</li>
<li>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/arcryalis.png" width="100" />
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/mpg.png" width="100" />
<br />
<strong>Events</strong><br />Maxwell Michael Gisborne (~mpg)</div>
</li>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/vectre.png" width="100" />
<br />
<strong>Gaming</strong><br />Hywel Williams (~arcryalis)</div>
<strong>Publicity</strong><br />Alexander Moras (~vectre)</div>
</li>
</ul>
<div class="clear"></div>
......@@ -100,4 +104,4 @@ exceptional help over the years.</p>
</div>
</div>
</div>
-->
\ No newline at end of file
-->
......@@ -7,5 +7,5 @@ hour access. There are usually members present through the week
so feel free to stop by.</p>
<p>Visit the <a href="Community">Community</a> section of the site for more
ways to get in touch with your fellow members, including <a href="Community/Milliways">Milliways</a>, our chat room.&nbsp;</p>
<p>SUCS celebrated its twenty-fifth birthday in the summer of 2014. We have compiled a site about the society's history. To read about it and contribute your part of the story, visit <a href="http://history.sucs.org/">http://history.sucs.org/</a>.</p>
<div style="text-align: center"><a href="http://history.sucs.org/"><img alt="SUCS history" height="50" src="https://sucs.org/images/sucshistory.png" width="231" /></a></div>
\ No newline at end of file
<p>SUCS celebrated its thirtieth birthday in the summer of 2019. We have compiled a site about the society's history. To read about it and contribute your part of the story, visit <a href="http://history.sucs.org/">http://history.sucs.org/</a>.</p>
<div style="text-align: center"><a href="http://history.sucs.org/"><img alt="SUCS history" height="50" src="https://sucs.org/images/sucshistory.png" width="231" /></a></div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment