<html lang='en'>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<title>
GitLab
</title>
</meta>
</head>
<style>
img {
max-width: 100%;
height: auto;
}
p.details {
font-style:italic;
color:#777
}
.footer p {
font-size:small;
color:#777
}
pre.commit-message {
white-space: pre-wrap;
}
.file-stats a {
text-decoration: none;
}
.file-stats .new-file {
color: #090;
}
.file-stats .deleted-file {
color: #B00;
}
</style>
<body>
<div class='content'>
<h3>Imran Hussain pushed to branch beta at <a href="https://projects.sucs.org/sucssite/sucs-site">sucssite / sucs-site</a></h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/8e84a71b8630b0516c7ec0bd64ce97434e36abb0">8e84a71b</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-10-21T12:10:28Z</i>
</div>
<pre class='commit-message'>Fix #22.
Remove the extra /Community from stream page urls</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/124f33bbc5dc3a6d69751d1c6c2090b286285e62">124f33bb</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-10-21T13:26:47Z</i>
</div>
<pre class='commit-message'>Fix a spacing issue</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/e9e2a380409e43365d51785ffcc06e5f527fb0f2">e9e2a380</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-10-21T13:27:07Z</i>
</div>
<pre class='commit-message'>Merge branch 'master' of projects.sucs.org:sucssite/sucs-site</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/67c8f9e0d206de8c3ad403c245116f3646f4be8f">67c8f9e0</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-10-26T14:43:37Z</i>
</div>
<pre class='commit-message'>Remove a dead page from the sucssite</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/457405cc2cb5ab9c1da7be1eabe7a58d1ee33da1">457405cc</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-11-05T10:48:28Z</i>
</div>
<pre class='commit-message'>Add the position of gaming officer to the election system</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/fc8a4561536217b9c442a036b550ac197bc22b1f">fc8a4561</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-11-05T11:12:07Z</i>
</div>
<pre class='commit-message'>Merge branch 'master' into beta.
Gitlab is a bit borked atm so a manual cli merge is needed</pre>
</li>
</ul>
<h4>4 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
database.sql
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
static/Community/Stream.txt
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
<span class='deleted-file'>
−
static/Knowledge/Help/scanner.txt
</span>
</a>
</li>
<li class='file-stats'>
<a href='#diff-3'>
templates/members.tpl
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/bc305a95d98a7df26d2552d6fb4330515152be26...fc8a4561536217b9c442a036b550ac197bc22b1f#diff-0'>
<strong>
database.sql
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/database.sql
</span><span style="color: #000000;background-color: #ddffdd">+++ b/database.sql
</span><span style="color: #aaaaaa">@@ -204,6 +204,7 @@ CREATE TABLE election_votes (
</span> treasurer text,
secretary text,
publicity text,
<span style="color: #000000;background-color: #ddffdd">+ gaming text,
</span> ipaddress text
);
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/bc305a95d98a7df26d2552d6fb4330515152be26...fc8a4561536217b9c442a036b550ac197bc22b1f#diff-1'>
<strong>
static/Community/Stream.txt
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/static/Community/Stream.txt
</span><span style="color: #000000;background-color: #ddffdd">+++ b/static/Community/Stream.txt
</span><span style="color: #aaaaaa">@@ -22,7 +22,7 @@
</span> </ul>
<p>
To view the stream in an external media player <em>(e.g VLC)</em>
<span style="color: #000000;background-color: #ffdddd">-<a href="../Community/Stream/External">Click Here for instructions</a><em><br /></em></p>
-<p>All streams are currently FLV format. If you have any problems, please read the <a href="../Community/Stream/FAQ">FAQ</a></p>
</span><span style="color: #000000;background-color: #ddffdd">+<a href="../Stream/External">Click Here for instructions</a><em><br /></em></p>
+<p>All streams are currently FLV format. If you have any problems, please read the <a href="../Stream/FAQ">FAQ</a></p>
</span> <ul>
</ul>
\ No newline at end of file
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/bc305a95d98a7df26d2552d6fb4330515152be26...fc8a4561536217b9c442a036b550ac197bc22b1f#diff-2'>
<strong>
static/Knowledge/Help/scanner.txt
</strong>
deleted
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/static/Knowledge/Help/scanner.txt
</span><span style="color: #000000;background-color: #ddffdd">+++ /dev/null
</span><span style="color: #aaaaaa">@@ -1 +0,0 @@
</span><span style="color: #000000;background-color: #ffdddd">-Page under construction
</span></code></pre>
<br>
</li>
<li id='diff-3'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/bc305a95d98a7df26d2552d6fb4330515152be26...fc8a4561536217b9c442a036b550ac197bc22b1f#diff-3'>
<strong>
templates/members.tpl
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/templates/members.tpl
</span><span style="color: #000000;background-color: #ddffdd">+++ b/templates/members.tpl
</span><span style="color: #aaaaaa">@@ -25,8 +25,7 @@
</span> {if $member.website }
<dt>Website</dt>
<dd>
<span style="color: #000000;background-color: #ffdddd">- <a href="http://sucs.org/~{$member.uid|escape:'url'}/">http://sucs.org/~{$member.uid|escape:'url'}
- /</a></dd>
</span><span style="color: #000000;background-color: #ddffdd">+ <a href="http://sucs.org/~{$member.uid|escape:'url'}/">http://sucs.org/~{$member.uid|escape:'url'}/</a></dd>
</span> {/if}
{if isset($member.project) }
<dt>Project</dt>
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://projects.sucs.org/sucssite/sucs-site/compare/bc305a95d98a7df26d2552d6fb4330515152be26...fc8a4561536217b9c442a036b550ac197bc22b1f">View it on GitLab</a>
<br>
You're receiving this email because of your account on <a href="https://projects.sucs.org/">projects.sucs.org</a>.
If you'd like to receive fewer emails, you can adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":["merge_requests","issues","commit"],"url":"https://projects.sucs.org/sucssite/sucs-site/compare/bc305a95d98a7df26d2552d6fb4330515152be26...fc8a4561536217b9c442a036b550ac197bc22b1f"}}</script>
</p>
</div>
</body>
</html>