[SUCS Devel] [Git][sucssite/sucs-site][sucs-site] 4 commits: updated some out of date stuff

[Laurence Sebastian Bowes]

Laurence Sebastian Bowes pushed to branch sucs-site at sucssite / sucs-site


Commits:
d21905a6 by Laurence Sebastian Bowes at 2019-09-12T14:38:54Z
updated some out of date stuff

- - - - -
99bd275b by Laurence Sebastian Bowes at 2019-09-12T14:49:26Z
Hopefully this fixes it
- - - - -
5f4e17eb by Laurence Sebastian Bowes at 2019-09-12T15:05:33Z
Merge branch 'master' into 'beta'

updated some out of date stuff

See merge request sucssite/sucs-site!112
- - - - -
a7104591 by Laurence Sebastian Bowes at 2019-09-12T15:13:19Z
Merge branch 'beta' into 'sucs-site'

Beta

See merge request sucssite/sucs-site!113
- - - - -


3 changed files:

- .gitlab-ci.yml
- static/About/Staff.txt
- static/fragments/Front.txt


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -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
 


=====================================
static/About/Staff.txt
=====================================
@@ -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> <img height="100" src="https://sucs.org/pictures/people/vectre.png" width="100" />
+<div> <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> <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> <img height="100" src="https://sucs.org/pictures/people/xray_effect.png" width="100" />
+<div> <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> <img height="100" src="https://sucs.org/pictures/people/arcryalis.png" width="100" />
+<div> <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> <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
+-->


=====================================
static/fragments/Front.txt
=====================================
@@ -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. </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>



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/37529fc81673abdf7a619b658b5ddde645880aae...a71045912e19c6f97629c6c4d5a1d6e033c0f09b

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/37529fc81673abdf7a619b658b5ddde645880aae...a71045912e19c6f97629c6c4d5a1d6e033c0f09b
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190912/b5b5269b/attachment-0001.html>