<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/91fc2c96a4045d398f1118cf5f6be70381e5f090">91fc2c96</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-09-11T17:25:58Z</i>
</div>
<pre class='commit-message'>Update the community page to mention git & gitlab</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/fbc34b606f88fca0593f07c38a655311628f4173">fbc34b60</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-09-11T17:32:30Z</i>
</div>
<pre class='commit-message'>Add a link to the Gitlab on the Projects page of the site.</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/feafd46c9d9b96a7a8d3fb49a79b8e7fa9b4ea54">feafd46c</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-09-14T11:09:03Z</i>
</div>
<pre class='commit-message'>Move the sucsunreadmail script to the plugins folder from my home dir</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/a4206f63445405303f0f93b3f7f59f19f80ee979">a4206f63</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-09-14T11:10:19Z</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/657d2b855afcc1cecba5f573035970cf81ff1d9e">657d2b85</a></strong>
<div>
<span>by Robert Scott James</span>
<i>at 2015-09-15T18:55:22Z</i>
</div>
<pre class='commit-message'>Added ckeditor stable as a submodule to htdocs/js/ckeditor
Added a gitignore so that the files generated by the setup script don't
get added to the repo in future.
Also included the the cached template folder 'template_c' so that
doesn't get included either
Changes to be committed:
new file: .gitignore
new file: .gitmodules
new file: htdocs/js/ckeditor</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/e516326e2c95a2f4686f8c0427db0382ddb7fcb3">e516326e</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-09-16T07:23:30Z</i>
</div>
<pre class='commit-message'>Merge branch 'master' into 'master'
ckeditor is now included as a submodule
Added ckeditor stable as a submodule to htdocs/js/ckeditor
Added a gitignore so that the files generated by the setup script don't get added to the repo in future.
Also included the the cached template folder 'template_c' so that doesn't get included either
Changes to be committed:
* new file: .gitignore
* new file: .gitmodules
* new file: htdocs/js/ckeditor
See merge request !3</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/9b8e12394c3cc4435db703d38c0f792b10164026">9b8e1239</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-09-16T09:32:13Z</i>
</div>
<pre class='commit-message'>Add the su-api password file to the git ignore</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/f3f7744793cfd4d9196f67f7eca2c16ec83c33b1">f3f77447</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-09-16T09:35:21Z</i>
</div>
<pre class='commit-message'>Add ~rjames93s suggestion for that paragraph of text.
https://projects.sucs.org/sucssite/sucs-site/commit/feafd46c9d9b96a7a8d3fb49a79b8e7fa9b4ea54#note_172</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/3262b0722310878398239a360d4d1721380e6ad9">3262b072</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-09-16T15:52:20Z</i>
</div>
<pre class='commit-message'>Merge branch 'master' into 'beta'
Deploy changes to beta.sucs.org
These changes look good to me.
no bugs that I can find, deploy to beta and see if it still holds up.
See merge request !4</pre>
</li>
</ul>
<h4>7 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
<span class='new-file'>
+
.gitignore
</span>
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
<span class='new-file'>
+
.gitmodules
</span>
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
<span class='new-file'>
+
htdocs/js/ckeditor
</span>
</a>
</li>
<li class='file-stats'>
<a href='#diff-3'>
lib/session.php
</a>
</li>
<li class='file-stats'>
<a href='#diff-4'>
<span class='new-file'>
+
plugins/sucsunreadmail
</span>
</a>
</li>
<li class='file-stats'>
<a href='#diff-5'>
static/Community.txt
</a>
</li>
<li class='file-stats'>
<a href='#diff-6'>
templates/projects.tpl
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/f59ad92eb2ad7bc5fa190af1eaf7bffbe811f647...3262b0722310878398239a360d4d1721380e6ad9#diff-0'>
<strong>
.gitignore
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- /dev/null
</span><span style="color: #000000;background-color: #ddffdd">+++ b/.gitignore
</span><span style="color: #aaaaaa">@@ -0,0 +1,14 @@
</span><span style="color: #000000;background-color: #ddffdd">+# Some of the files that are generated by the setup script don't want to be version controlled.
+# To that end I have added this .gitignore file to ignore the following files and folders
+
+# This is the generated .htaccess
+htdocs/.htaccess
+
+# Generated settings.php file
+settings.php
+
+# Compiled templates_c
+templates_c/
+
+# Password file for the su-api thing
+suapi.inc.php
</span>\ No newline at end of file
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/f59ad92eb2ad7bc5fa190af1eaf7bffbe811f647...3262b0722310878398239a360d4d1721380e6ad9#diff-1'>
<strong>
.gitmodules
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- /dev/null
</span><span style="color: #000000;background-color: #ddffdd">+++ b/.gitmodules
</span><span style="color: #aaaaaa">@@ -0,0 +1,3 @@
</span><span style="color: #000000;background-color: #ddffdd">+[submodule "htdocs/js/ckeditor"]
+ path = htdocs/js/ckeditor
+ url = git://github.com/ckeditor/ckeditor-releases.git
</span></code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/f59ad92eb2ad7bc5fa190af1eaf7bffbe811f647...3262b0722310878398239a360d4d1721380e6ad9#diff-2'>
<strong>
htdocs/js/ckeditor
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- /dev/null
</span><span style="color: #000000;background-color: #ddffdd">+++ b/htdocs/js/ckeditor
</span><span style="color: #aaaaaa">@@ -0,0 +1 @@
</span><span style="color: #000000;background-color: #ddffdd">+Subproject commit a93cb51eb1fc85a13892706dd61eccfd4c999947
</span></code></pre>
<br>
</li>
<li id='diff-3'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/f59ad92eb2ad7bc5fa190af1eaf7bffbe811f647...3262b0722310878398239a360d4d1721380e6ad9#diff-3'>
<strong>
lib/session.php
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/lib/session.php
</span><span style="color: #000000;background-color: #ddffdd">+++ b/lib/session.php
</span><span style="color: #aaaaaa">@@ -227,7 +227,7 @@ private $datahash=''; // hash of data field
</span> }*/
// a sure-fire way to check to see if the user has any unread email
// the bash script returns 0 for no and 1 for yes, takes one arg, username
- $this->email = shell_exec("/home/member/imranh/bin/sucsunreadmail $user");
<span style="color: #000000;background-color: #ddffdd">+ $this->email = shell_exec("../plugins/sucsunreadmail $user");
</span>
if (file_exists($info['homedirectory'][0]."/.forward")) {
$forward = file($info['homedirectory'][0]."/.forward");
</code></pre>
<br>
</li>
<li id='diff-4'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/f59ad92eb2ad7bc5fa190af1eaf7bffbe811f647...3262b0722310878398239a360d4d1721380e6ad9#diff-4'>
<strong>
plugins/sucsunreadmail
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- /dev/null
</span><span style="color: #000000;background-color: #ddffdd">+++ b/plugins/sucsunreadmail
</span><span style="color: #aaaaaa">@@ -0,0 +1,8 @@
</span><span style="color: #000000;background-color: #ddffdd">+#!/bin/bash
+
+if finger -m $1 | grep "New mail" &> /dev/null
+ then
+ echo "1"
+ else
+ echo "0"
+fi
</span>\ No newline at end of file
</code></pre>
<br>
</li>
<li id='diff-5'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/f59ad92eb2ad7bc5fa190af1eaf7bffbe811f647...3262b0722310878398239a360d4d1721380e6ad9#diff-5'>
<strong>
static/Community.txt
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/static/Community.txt
</span><span style="color: #000000;background-color: #ddffdd">+++ b/static/Community.txt
</span><span style="color: #aaaaaa">@@ -6,7 +6,7 @@ Community</h3>
</span> <dt><a href="Community/Talks">SUCS Lightning Talks</a></dt>
<dd>A great way to share things you are passionate about with fellow members. We've had 3 Lightning Talks so far in the past 2 years and each of them have been very well received. Footage of the talks can also be found in this section.</dd>
<dt><a href="Community/Projects">SUCS Projects</a></dt>
-<dd>SUCS hosts a number of open source coding projects and offers its members Subversion repositories and Trac wiki/ticket trackers to manage their projects. The projects page lists a number of projects which SUCS members are currently working on, and which you can get involved with.</dd>
<span style="color: #000000;background-color: #ddffdd">+<dd>SUCS hosts a number of open source coding projects and offers its members Git & Subversion repositories. To enhance these repositories we also provide Gitlab Projects & the Trac wiki/ticket tracking system to assist in the management of projects. The projects page lists a number of projects which SUCS members are currently working on, and which you can get involved with.</dd>
</span> <dt>Socials</dt>
<dd>We regularly meet in JCs every Wednesday at 1PM and most Fridays at 7PM. It's a great chance to get to know everyone and have a chat with people. </dd>
</dl>
<span style="color: #aaaaaa">@@ -14,4 +14,4 @@ Community</h3>
</span> <ul>
<li>We have a page on <a href="https://www.facebook.com/SwanseaUniversityComputerSociety" title="SUCS">Facebook</a></li>
<li>Through our <a href="https://twitter.com/SUCSExec">Twitter</a></li>
-</ul>
<span style="color: #000000;background-color: #ddffdd">+</ul>
</span>\ No newline at end of file
</code></pre>
<br>
</li>
<li id='diff-6'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/f59ad92eb2ad7bc5fa190af1eaf7bffbe811f647...3262b0722310878398239a360d4d1721380e6ad9#diff-6'>
<strong>
templates/projects.tpl
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/templates/projects.tpl
</span><span style="color: #000000;background-color: #ddffdd">+++ b/templates/projects.tpl
</span><span style="color: #aaaaaa">@@ -1,7 +1,10 @@
</span> <h3>Projects currently hosted by SUCS</h3>
<span style="color: #000000;background-color: #ddffdd">+
+<p>SUCS has recently deployed <a href="https://projects.sucs.org/explore">Gitlab</a> with a more expansive list of projects.</p>
+
</span> <dl>
{foreach name=projects from=$projects item=project}
<dt><a href="http://projects.sucs.org/projects/{$project.filename}">{$project.name}</a></dt>
{if $project.descr}<dd>{$project.descr}{/if}</dd>
{/foreach}
-</dl>
<span style="color: #000000;background-color: #ddffdd">+</dl>
</span>\ No newline at end of file
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://projects.sucs.org/sucssite/sucs-site/compare/f59ad92eb2ad7bc5fa190af1eaf7bffbe811f647...3262b0722310878398239a360d4d1721380e6ad9">View it on GitLab</a>
<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/f59ad92eb2ad7bc5fa190af1eaf7bffbe811f647...3262b0722310878398239a360d4d1721380e6ad9"}}</script>
</p>
</div>
</body>
</html>