[SUCS Devel] [Git][sucssite/sucs-site][beta] 9 commits: Update the community page to mention git & gitlab
Imran Hussain
imranh at sucs.org
Wed Sep 16 15:52:28 BST 2015
Imran Hussain pushed to branch beta at sucssite / sucs-site
Commits:
91fc2c96 by Imran Hussain at 2015-09-11T17:25:58Z
Update the community page to mention git & gitlab
- - - - -
fbc34b60 by Imran Hussain at 2015-09-11T17:32:30Z
Add a link to the Gitlab on the Projects page of the site.
- - - - -
feafd46c by Imran Hussain at 2015-09-14T11:09:03Z
Move the sucsunreadmail script to the plugins folder from my home dir
- - - - -
a4206f63 by Imran Hussain at 2015-09-14T11:10:19Z
Merge branch 'master' of projects.sucs.org:sucssite/sucs-site
- - - - -
657d2b85 by Robert Scott James at 2015-09-15T18:55:22Z
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
- - - - -
e516326e by Imran Hussain at 2015-09-16T07:23:30Z
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
- - - - -
9b8e1239 by Imran Hussain at 2015-09-16T09:32:13Z
Add the su-api password file to the git ignore
- - - - -
f3f77447 by Imran Hussain at 2015-09-16T09:35:21Z
Add ~rjames93s suggestion for that paragraph of text.
https://projects.sucs.org/sucssite/sucs-site/commit/feafd46c9d9b96a7a8d3fb49a79b8e7fa9b4ea54#note_172
- - - - -
3262b072 by Imran Hussain at 2015-09-16T15:52:20Z
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
- - - - -
7 changed files:
- + .gitignore
- + .gitmodules
- + htdocs/js/ckeditor
- lib/session.php
- + plugins/sucsunreadmail
- static/Community.txt
- templates/projects.tpl
Changes:
=====================================
.gitignore
=====================================
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+# 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
\ No newline at end of file
=====================================
.gitmodules
=====================================
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "htdocs/js/ckeditor"]
+ path = htdocs/js/ckeditor
+ url = git://github.com/ckeditor/ckeditor-releases.git
=====================================
htdocs/js/ckeditor
=====================================
--- /dev/null
+++ b/htdocs/js/ckeditor
@@ -0,0 +1 @@
+Subproject commit a93cb51eb1fc85a13892706dd61eccfd4c999947
=====================================
lib/session.php
=====================================
--- a/lib/session.php
+++ b/lib/session.php
@@ -227,7 +227,7 @@ private $datahash=''; // hash of data field
}*/
// 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");
+ $this->email = shell_exec("../plugins/sucsunreadmail $user");
if (file_exists($info['homedirectory'][0]."/.forward")) {
$forward = file($info['homedirectory'][0]."/.forward");
=====================================
plugins/sucsunreadmail
=====================================
--- /dev/null
+++ b/plugins/sucsunreadmail
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if finger -m $1 | grep "New mail" &> /dev/null
+ then
+ echo "1"
+ else
+ echo "0"
+fi
\ No newline at end of file
=====================================
static/Community.txt
=====================================
--- a/static/Community.txt
+++ b/static/Community.txt
@@ -6,7 +6,7 @@ Community</h3>
<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>
+<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>
<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>
@@ -14,4 +14,4 @@ Community</h3>
<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>
+</ul>
\ No newline at end of file
=====================================
templates/projects.tpl
=====================================
--- a/templates/projects.tpl
+++ b/templates/projects.tpl
@@ -1,7 +1,10 @@
<h3>Projects currently hosted by SUCS</h3>
+
+<p>SUCS has recently deployed <a href="https://projects.sucs.org/explore">Gitlab</a> with a more expansive list of projects.</p>
+
<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>
+</dl>
\ No newline at end of file
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/f59ad92eb2ad7bc5fa190af1eaf7bffbe811f647...3262b0722310878398239a360d4d1721380e6ad9
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20150916/93853b7e/attachment.html>
More information about the Devel
mailing list