Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sucs-site
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sucssite
sucs-site
Compare revisions
1ef2605c94a5b48a2de07e303bf4c427d452c583 to 4795e418472c8aa0fe6d342a8a7c1b42906f0d0c
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
sucssite/sucs-site
Select target project
No results found
4795e418472c8aa0fe6d342a8a7c1b42906f0d0c
Select Git revision
Branches
beta
master
sucs-site
Swap
Target
sucssite/sucs-site
Select target project
osian/sucs-site
kais58/sucs-site
imranh/sucs-site
foshjedi2004/sucs-site
gigosaurus/sucs-site
matstn/sucs-site
ripp_/sucs-site
eggnog/sucs-site
sucssite/sucs-site
elbows/sucs-site
realitykiller/sucs-site
crox/sucs-site
vectre/sucs-site
welshbyte/sucs-site
paperclipman/sucs-site
15 results
1ef2605c94a5b48a2de07e303bf4c427d452c583
Select Git revision
Branches
beta
master
sucs-site
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (5)
Update history to say N/A instead of none where the position didn't exist.
· 3793cd64
Imran Hussain
authored
9 years ago
3793cd64
Updated names
· 59e50001
Isabel Jenkins
authored
9 years ago
59e50001
Fix #25: Kill the projects landning page and go straight to GitLab.
· 3f457c2e
Imran Hussain
authored
9 years ago
3f457c2e
Update staff and history pages to include 2016s exec
· d788d45f
Imran Hussain
authored
9 years ago
d788d45f
Merge branch 'master' into beta
· 4795e418
Imran Hussain
authored
9 years ago
4795e418
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
database.sql
+1
-1
1 addition, 1 deletion
database.sql
static/About/History.txt
+54
-44
54 additions, 44 deletions
static/About/History.txt
static/About/Staff.txt
+8
-8
8 additions, 8 deletions
static/About/Staff.txt
with
63 additions
and
53 deletions
database.sql
View file @
4795e418
...
...
@@ -2101,7 +2101,7 @@ COPY menu (id, title, parent, menuorder, target, title_cy, permission) FROM stdi
19 Members 16 1 /Community/Members Aelodau \N
20 Societies 16 2 /Community/Societies Cymdeithasau \N
33 Desktop on Demand 8 5 /Tools/Desktop on Demand \N \N
34 Projects 16 8
/Community/Projects
\N \N
34 Projects 16 8
https://projects.sucs.org/explore
\N \N
3 About \N 2 /About Amdano \N
16 Community \N 4 /Community Cymuned \N
37 Talks 16 5 /Community/Talks \N \N
...
...
This diff is collapsed.
Click to expand it.
static/About/History.txt
View file @
4795e418
...
...
@@ -14,13 +14,23 @@
</tr>
<tr>
<td>
<p><strong>201
5
</strong></p>
<p><strong>201
6
</strong></p>
</td>
<td><strong><a href="/~
imranh">imranh</a> (Imran Hussain
)</strong></td>
<td><strong><a href="/~
stig">stig</a> (Priyan Gami
)</strong></td>
<td><strong><a href="/~
sockitwench">sockitwench</a> (Courtney Simone Vasile
)</strong></td>
<td><strong><a href="/~
elbows">elbows</a> (Laurence Sebastian Bowes
)</strong></td>
<td><strong><a href="/~
unreturnable">unreturnable</a> (Isabel Jenkins
)</strong></td>
<td><strong><a href="/~
coatlus">coatlus</a> (Quetzal Miguel Creamer Shorey
)</strong></td>
<td><strong><a href="/~andy">andy</a> (Andrew Vincent Pover)</strong></td>
<td><strong><a href="/~unreturnable">unreturnable</a> (Peter Jenkins)</strong></td>
<td><strong><a href="/~gigosaurus">gigosaurus</a> (Christopher Lindsay Manners)</strong></td>
</tr>
<tr>
<td>
<p>2015</p>
</td>
<td><a href="/~imranh">imranh</a> (Imran Hussain)</td>
<td><a href="/~stig">stig</a> (Priyan Gami)</td>
<td><a href="/~sockitwench">sockitwench</a> (Courtney Simone Vasile)</td>
<td><a href="/~andy">andy</a> (Andrew Vincent Pover)</td>
<td><a href="/~unreturnable">unreturnable</a> (Isabel Jenkins)</td>
</tr>
<tr>
<td>
...
...
@@ -30,7 +40,7 @@
<td><a href="/~stig">stig</a> (Priyan Gami)</td>
<td><a href="/~nenenxi">nenenxi</a> (Calum Mark Phillips)</td>
<td><a href="/~sambw">sambw</a> (Samuel Joseph Bust-Webber)</td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>
...
...
@@ -40,7 +50,7 @@
<td><a href="/~grepwood">grepwood</a> (Michael Dec)</td>
<td><a href="/~shirelings89">shirelings89</a> (Lorah Woodward)</td>
<td><a href="/~melonxhead">melonxhead</a> (Jake Bailey)</td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>
...
...
@@ -50,7 +60,7 @@
<td><a href="/~zephyr">zephyr</a> (Safi Dewshi)</td>
<td><a href="/~rjames93">rjames93</a> (Rob James)</td>
<td><a href="/~shirelings89">shirelings89</a> (Lorah Woodward)</td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>
...
...
@@ -60,7 +70,7 @@
<td><a href="/~snowdrake">snowdrake</a> (Jess Hunt)</td>
<td><a href="/~ed">ed</a> (Ed Smith)</td>
<td><a href="/~hantudemon">hantudemon</a> (Joseph Bhart)</td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>
...
...
@@ -70,7 +80,7 @@
<td><a href="/~gandalftheginger">gandalftheginger</a> (Ashley Morris)</td>
<td><a href="/~itsme">itsme</a> (Jon Gordon)</td>
<td><em>None</em></td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>2009</td>
...
...
@@ -78,7 +88,7 @@
<td><a href="/~tswsl1989">tswsl1989</a> (Tom Lake)</td>
<td><a href="/~insacuri">insacuri</a> (Adam Mann)</td>
<td><a href="/~foshjedi2004">foshjedi2004</a> (Chris Melvin)</td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>2008</td>
...
...
@@ -86,7 +96,7 @@
<td><a href="/~worldinsideme">worldinsideme</a> (Nick Corlett)</td>
<td><a href="/~eclipse">eclipse</a> (Tim Clark)</td>
<td><a href="/~kyara">kyara</a> (Jocelyn Konrad-Lee)</td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>2007</td>
...
...
@@ -94,7 +104,7 @@
<td><a href="/~loki">loki</a> (Kristian Knevitt)</td>
<td><a href="/~elsmorian">Elsmorian</a> (Chris Elsmore)</td>
<td><a href="/~frosty">frosty</a> (James Frost)</td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>2006</td>
...
...
@@ -102,7 +112,7 @@
<td><a href="/~welshbyte">welshbyte</a> (Andrew Price)</td>
<td><a href="/~talyn256">talyn256</a> (Sean Handley)</td>
<td><a href="/~elsmorian">Elsmorian</a> (Chris Elsmore)</td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>2005</td>
...
...
@@ -110,7 +120,7 @@
<td><a href="/~stringfellow">stringfellow</a> (Stephen Pike)</td>
<td><a href="/~davea">davea</a> (Dave Arter)</td>
<td><a href="/~wedge">wedge</a> (William Blackstock)</td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>2004</td>
...
...
@@ -118,7 +128,7 @@
<td><a href="/~pwb">pwb</a> (Peter Berry)</td>
<td><a href="/~vortex">vortex</a> (Toby Talbot)</td>
<td><a href="/~zulu">zulu</a> (Fernando Loizides)</td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>2003</td>
...
...
@@ -126,7 +136,7 @@
<td><a href="/~cj">cj</a> (Chris Jessop)</td>
<td><a href="/~ct">ct</a> (Chris Turner)</td>
<td><a href="/~aggie">aggie</a> (Jon Agland)</td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>2002</td>
...
...
@@ -134,7 +144,7 @@
<td><a href="/~theraven">TheRaven</a> (David Chisnall)</td>
<td><a href="/~doug">Doug</a> (Doug Gore)</td>
<td><em>None</em></td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>2001</td>
...
...
@@ -142,7 +152,7 @@
<td><a href="/~theraven">TheRaven</a> (David Chisnall)</td>
<td><a href="/~sonic">Sonic</a> (David Chester)</td>
<td><a href="/~daveb">DaveB</a> (David Brooks)</td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>2000-2001</td>
...
...
@@ -150,103 +160,103 @@
<td><a href="/~paul">Paul</a> (Paul Adams)</td>
<td><a href="/~cmckenna">cmckenna</a> (Chris McKenna)</td>
<td><a href="/~jo">Jo</a> </td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>1999-2000</td>
<td><a href="/~firefury">FireFury</a> (Steve Hill)</td>
<td><a href="/~rhys">Rhys</a> (Rhys Jones) &<br /><a href="../~">Paul</a> (Paul Adams)</td>
<td><a href="/~fry">Fry</a> (Chris Fry)</td>
<td><em>N
one
</em></td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>1998-1999</td>
<td><a href="/~dez">Dez</a> (Denis Walker)</td>
<td><a href="/~rhys">Rhys</a> (Rhys Jones)</td>
<td><a href="/~firefury">FireFury</a> (Steve Hill)</td>
<td><em>N
one
</em></td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>1997-1998</td>
<td><a href="/~dez">Dez</a> (Denis Walker)</td>
<td><a href="/~rhys">Rhys</a> (Rhys Jones)</td>
<td><em>None</em></td>
<td><em>N
one
</em></td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>1996-1997</td>
<td>Ramps (Brian Coplin)</td>
<td><a href="/~zute/">Zute</a> (Matthew Suter)<br /></td>
<td><em>None</em></td>
<td><em>N
one
</em></td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>1995-1996</td>
<td>Eldritch (Jon Lewis)</td>
<td><a href="/~xadraek">Xadraek</a> (Lee Stephens)</td>
<td><a href="/~rohan">Rohan</a> (Steven Whitehouse)</td>
<td><em>N
one
</em></td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>1994-1995</td>
<td><a href="/~milamber">Milamber</a> (Andrew Hogg)</td>
<td><a href="/~xadraek">Xadraek</a> (Lee Stephens)</td>
<td><a href="/~rohan">Rohan</a> (Steven Whitehouse)</td>
<td><em>N
one
</em></td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>1993-1994</td>
<td><a href="/~nympho">Nympho</a> (Mike Evans)</td>
<td><a href="/~milamber">Milamber</a> (Andrew Hogg)</td>
<td><a href="/~rohan">Rohan</a> (Steven Whitehouse)</td>
<td><em>N
one
</em></td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>1992-1993</td>
<td><a href="/~mocelet">Mocelet</a> (Richard Bytheway)</td>
<td> </td>
<td><a href="/~gerbil">Gerbil</a> (Debbie Gwynne)</td>
<td><em>N
one
</em></td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>1991-1992</td>
<td><a href="/~arthur">Arthur</a> (Justin Mitchell)</td>
<td>Michele Poole</td>
<td>Adrian Bateman</td>
<td><em>N
one
</em></td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>1990-1991</td>
<td>Pete Barber</td>
<td><a href="/~alexw">alexw</a> (Alex Williams)</td>
<td><a href="/~cariad">Cariad</a> (Paul Rees)</td>
<td><em>N
one
</em></td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>1989-1990</td>
<td>Andy Parkman</td>
<td><a href="/~alexw">alexw</a> (Alex Williams)</td>
<td><a href="/~caederus">caederus</a> (Robin O'Leary)</td>
<td><em>N
one
</em></td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
<td><em>N
/A
</em></td>
</tr>
<tr>
<td>1988-1989</td>
<td>Andy Parkman</td>
<td><a href="/~alexw">alexw</a> (Alex Williams)</td>
<td><a href="/~caederus">caederus</a> (Robin O'Leary)</td>
<td><em>N
one
</em></td>
<td><em>N
one
</em></td>
<td><em>N
/A
</em></td>
<td><em>N
/A
</em></td>
</tr>
</tbody>
</table>
...
...
This diff is collapsed.
Click to expand it.
static/About/Staff.txt
View file @
4795e418
...
...
@@ -4,21 +4,21 @@
<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/
imranh
.png" width="100" />
<div> <img height="100" src="https://sucs.org/pictures/people/
elbows
.png" width="100" />
<br />
<strong>President</strong><br />
Imran Hussain (~imranh
)</div>
<strong>President</strong><br />
Laurence Sebastian Bowes (~elbows
)</div>
</li>
<li>
<div> <img height="100" src="https://sucs.org/pictures/people/
stig
.png" width="100" />
<div> <img height="100" src="https://sucs.org/pictures/people/
unreturnable
.png" width="100" />
<br />
<strong>Treasurer</strong><br />
Priyan Gami (~stig
)
<strong>Treasurer</strong><br />
Isabel Jenkins (~unreturnable
)
</div>
</li>
<li>
<div>
<div> <img height="100" src="https://sucs.org/pictures/people/
sockitwench
.png" width="100" />
<div> <img height="100" src="https://sucs.org/pictures/people/
coatlus
.png" width="100" />
<br />
<strong>Secretary</strong><br />
Courtney Simone Vasile (~sockitwench
)
<strong>Secretary</strong><br />
Quetzal Miguel Creamer Shorey (~coatlus
)
</div>
</div>
</li>
...
...
@@ -29,9 +29,9 @@
</div>
</li>
<li>
<div> <img height="100" src="https://sucs.org/pictures/people/
unreturnable
.png" width="100" />
<div> <img height="100" src="https://sucs.org/pictures/people/
gigosaurus
.png" width="100" />
<br />
<strong>Gaming</strong><br />
Peter Jenkins (~unreturnable
)
<strong>Gaming</strong><br />
Christopher Lindsay Manners (~gigosaurus
)
</div>
</li>
</ul>
...
...
This diff is collapsed.
Click to expand it.