Commits · redesign · Imran Hussain / sucs-site

11 Oct, 2016 2 commits
- Merge branch 'redesign' of projects.sucs.org:imranh/sucs-site into redesign · 96e25766
  Imran Hussain authored Oct 11, 2016
```
Conflicts:
	templates/head.tpl
	templates/index.tpl
```
  96e25766
- Merge remote-tracking branch 'upstream/master' into redesign · da693964
  Imran Hussain authored Oct 11, 2016
```
Conflicts:
	static/About/Room-secondary.txt
	static/About/Room.txt
	templates/head.tpl
	templates/index.tpl
```
  da693964
03 Oct, 2016 2 commits
- Write a function to work around broken msl shit · c5966e6f
  Imran Hussain authored Oct 03, 2016
  
  c5966e6f
- fix suapi · 8b720c5f
  Imran Hussain authored Oct 03, 2016
  
  8b720c5f
29 Sep, 2016 2 commits
- Better scanner help · c2cb2fef
  Laurence Sebastian Bowes authored Sep 29, 2016
  
  c2cb2fef
- A more sensible contact address (again) · 0622ae13
  Laurence Sebastian Bowes authored Sep 29, 2016
  
  0622ae13
28 Sep, 2016 1 commit
- Update page-feedback.php · 93c374bc
  Laurence Sebastian Bowes authored Sep 28, 2016
  
  93c374bc
25 Sep, 2016 1 commit
- Update Room.txt with a bit more useful information · 31cb7e43
  Laurence Sebastian Bowes authored Sep 25, 2016
  
  31cb7e43
20 Sep, 2016 2 commits
- Merge branch 'beta' · ac65d5d0
  Imran Hussain authored Sep 20, 2016
  
  ac65d5d0
- Fix suapi again... · 419d3d7c
  Imran Hussain authored Sep 20, 2016
  
  419d3d7c
05 Sep, 2016 2 commits
- Merge branch 'master' into beta · 25678b07
  Imran Hussain authored Sep 05, 2016
  
  25678b07
- fix su api · c46edb84
  Imran Hussain authored Sep 05, 2016
  
  c46edb84
15 Jul, 2016 2 commits
- Add "enviroments" to the sucssite ci thing. · 1f4a4016
  Imran Hussain authored Jul 15, 2016
```
https://projects.sucs.org/help/ci/environments
```
  1f4a4016
- Add "enviroments" to the sucssite ci thing. · 8132522d
  Imran Hussain authored Jul 15, 2016
```
https://projects.sucs.org/help/ci/environments
```
  8132522d
30 May, 2016 2 commits
- Merge branch 'master' into beta · 5d6c6eed
  Imran Hussain authored May 30, 2016
  
  5d6c6eed
- Remove live cam image from site. · 77f4ec17
  Imran Hussain authored May 30, 2016
  
  77f4ec17
25 Apr, 2016 1 commit
- grammar · c14fcdca
  Andrew Vincent Pover authored Apr 25, 2016
  
  c14fcdca
12 Mar, 2016 3 commits
- Merge branch 'master' into beta · ec709448
  Imran Hussain authored Mar 12, 2016
  
  ec709448
- Remove old info from stream page · edf6aa38
  Imran Hussain authored Mar 12, 2016
  
  edf6aa38
- Update stream page with new info · bbd8423e
  Imran Hussain authored Mar 12, 2016
  
  bbd8423e
17 Feb, 2016 1 commit
- Updated info following on from what I think #29 was talking about · 85a840ef
  Laurence Sebastian Bowes authored Feb 17, 2016
  
  85a840ef
13 Feb, 2016 2 commits
- Minor fixes. Happy with this code now. · c2f7394d
  Laurence Sebastian Bowes authored Feb 13, 2016
  
  c2f7394d
- Twat · 080478fe
  Laurence Sebastian Bowes authored Feb 13, 2016
  
  080478fe
29 Dec, 2015 2 commits
- Replace the old UID generation. · a16d95d0
  Imran Hussain authored Dec 29, 2015
```
New UID generation system that uses the full year as a prefix. Should stop UIDs
from being reused.
```
  a16d95d0
- Merge remote-tracking branch 'upstream/master' into redesign · 255f8db3
  Imran Hussain authored Dec 29, 2015
  
  255f8db3
21 Dec, 2015 1 commit
- Merge branch 'master' into beta · 4795e418
  Imran Hussain authored Dec 21, 2015
  
  4795e418
16 Dec, 2015 1 commit
- Update staff and history pages to include 2016s exec · d788d45f
  Imran Hussain authored Dec 16, 2015
  
  d788d45f
08 Dec, 2015 1 commit
- Fix #25: Kill the projects landning page and go straight to GitLab. · 3f457c2e
  Imran Hussain authored Dec 08, 2015
  
  3f457c2e
07 Dec, 2015 1 commit
- Updated names · 59e50001
  Isabel Jenkins authored Dec 07, 2015
  
  59e50001
04 Dec, 2015 3 commits
- Update history to say N/A instead of none where the position didn't exist. · 3793cd64
  Imran Hussain authored Dec 04, 2015
  
  3793cd64
- Merge branch 'master' into beta · 1ef2605c
  Imran Hussain authored Dec 04, 2015
  
  1ef2605c
- Update the sucs exec history page to make it more consistent · c62395a1
  Imran Hussain authored Dec 04, 2015
  
  c62395a1
01 Dec, 2015 3 commits
- Merge branch 'master' into beta · 2e977a59
  Imran Hussain authored Dec 01, 2015
  
  2e977a59
- fixed janet acceptable use policy · d1f6423e
  Tim Clark authored Dec 01, 2015
  
  d1f6423e
- Fix #23: Remove create, edit, and delete buttons from static pages. · a3bf305c
  Imran Hussain authored Dec 01, 2015
```
If you want to add, modify, or delete content from the site, use the git.
Either commit directly to master or make an MR if you can't commit.
```
  a3bf305c
30 Nov, 2015 1 commit
- Add the gaming officer to the history · 07cb60c1
  Imran Hussain authored Nov 30, 2015
  
  07cb60c1
11 Nov, 2015 2 commits
- Make the previous commit a little more robust and add some comments · 5f85bd0d
  Laurence Sebastian Bowes authored Nov 11, 2015
  
  5f85bd0d
- Fix sending out broken links in banana emails · 54d868d5
  Laurence Sebastian Bowes authored Nov 11, 2015
  
  54d868d5
10 Nov, 2015 1 commit
- Update setup.sh to check if the script is int eh right place in a better way · c5648289
  Imran Hussain authored Nov 10, 2015
  
  c5648289
09 Nov, 2015 1 commit

what · d9387cf9

Laurence Sebastian Bowes authored Nov 09, 2015

Merge branch 'master' of https://projects.sucs.org/sucssite/sucs-site

d9387cf9