<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 master 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/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>
</ul>
<h4>3 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>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/a4206f63445405303f0f93b3f7f59f19f80ee979...e516326e2c95a2f4686f8c0427db0382ddb7fcb3#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,11 @@
</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/
</span></code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/a4206f63445405303f0f93b3f7f59f19f80ee979...e516326e2c95a2f4686f8c0427db0382ddb7fcb3#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/a4206f63445405303f0f93b3f7f59f19f80ee979...e516326e2c95a2f4686f8c0427db0382ddb7fcb3#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>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://projects.sucs.org/sucssite/sucs-site/compare/a4206f63445405303f0f93b3f7f59f19f80ee979...e516326e2c95a2f4686f8c0427db0382ddb7fcb3">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/a4206f63445405303f0f93b3f7f59f19f80ee979...e516326e2c95a2f4686f8c0427db0382ddb7fcb3"}}</script>
</p>
</div>
</body>
</html>