Commits · sucs-site · sucssite / sucs-site

04 Dec, 2019 2 commits
- Merge branch 'beta' into 'sucs-site' · 4dd52a81
  Tom Lake authored Dec 04, 2019
```
Push Beta to Live (Delete SUCS Tools instructions)

See merge request !122
```
  4dd52a81
- Delete Using the SUCS Tools.txt · f4d4c46f
  Tom Lake authored Dec 04, 2019
  
  f4d4c46f
25 Sep, 2019 3 commits
- Merge branch 'beta' into 'sucs-site' · 8c4c820e
  Imran Hussain authored Sep 25, 2019
```
join.sucs.org - Open links in new tabs

See merge request !120
```
  8c4c820e
- Merge branch 'master' into 'beta' · b5a31cca
  Imran Hussain authored Sep 25, 2019
```
join.sucs.org - Open links in new tabs

See merge request !119
```
  b5a31cca
- join.sucs.org - Open links in new tabs · c3340846
  Imran Hussain authored Sep 25, 2019
  
  c3340846
24 Sep, 2019 9 commits
- Merge branch 'beta' into 'sucs-site' · d770a230
  Imran Hussain authored Sep 24, 2019
```
Fix a typo

See merge request sucssite/sucs-site!118
```
  d770a230
- Merge branch 'master' into 'beta' · c692f3b7
  Imran Hussain authored Sep 24, 2019
```
Correct typo

See merge request !117
```
  c692f3b7
- Correct typo · a30362c1
  Andrew Vincent Pover authored Sep 24, 2019
  
  a30362c1
- Merge branch 'beta' into 'sucs-site' · 88694de7
  Imran Hussain authored Sep 24, 2019
```
new join.sucs.org and auto deploy fixes

See merge request !116
```
  88694de7
- Merge branch 'master' into 'beta' · b5cb3dff
  Imran Hussain authored Sep 24, 2019
```
Fix sucs site deploy script thing

See merge request !115
```
  b5cb3dff
- really fix the pull script · 683c9187
  Imran Hussain authored Sep 24, 2019
  
  683c9187
- Fix sucs site deploy script thing · f86ec8d5
  Imran Hussain authored Sep 24, 2019
  
  f86ec8d5
- Merge branch 'master' into 'beta' · 245ce50d
  Imran Hussain authored Sep 24, 2019
```
new join.sucs.org page

See merge request !114
```
  245ce50d
- new join.sucs.org page · ee16606a
  Imran Hussain authored Sep 24, 2019
  
  ee16606a
12 Sep, 2019 4 commits
- Merge branch 'beta' into 'sucs-site' · a7104591
  Laurence Sebastian Bowes authored Sep 12, 2019
```
Beta

See merge request !113
```
  a7104591
- Merge branch 'master' into 'beta' · 5f4e17eb
  Laurence Sebastian Bowes authored Sep 12, 2019
```
updated some out of date stuff

See merge request !112
```
  5f4e17eb
- Hopefully this fixes it · 99bd275b
  Laurence Sebastian Bowes authored Sep 12, 2019
  
  99bd275b
- updated some out of date stuff · d21905a6
  Laurence Sebastian Bowes authored Sep 12, 2019
  
  d21905a6
02 Jul, 2019 4 commits
- Merge branch 'beta' into 'sucs-site' · 37529fc8
  Imran Hussain authored Jul 02, 2019
```
ability for site to auto deploy

See merge request !111
```
  37529fc8
- Merge branch 'master' into 'beta' · 6cf55875
  Imran Hussain authored Jul 02, 2019
```
Merge changes into beta

See merge request !110
```
  6cf55875
- make the pull script do errors better · 56268f16
  Imran Hussain authored Jul 02, 2019
  
  56268f16
- Revert "throw in a --insecure as the LE cert not trusted by this docker container" · 503dc539
  Imran Hussain authored Jul 02, 2019
```
This reverts commit 8c489c75
```
  503dc539
01 Jul, 2019 6 commits
- Merge branch 'master' into 'beta' · 2852e83b
  Imran Hussain authored Jul 01, 2019
```
throw in a --insecure as the LE cert not trusted by this docker container

See merge request !109
```
  2852e83b
- throw in a --insecure as the LE cert not trusted by this docker container · 8c489c75
  Imran Hussain authored Jul 01, 2019
  
  8c489c75
- Merge branch 'master' into 'beta' · 5e80bacf
  Imran Hussain authored Jul 01, 2019
```
non-interactive! need a -y in gitlab-ci!

See merge request !108
```
  5e80bacf
- non-interactive! need a -y in gitlab-ci! · 94fccbb1
  Imran Hussain authored Jul 01, 2019
  
  94fccbb1
- Merge branch 'master' into 'beta' · 9670a51f
  Imran Hussain authored Jul 01, 2019
```
SUCS Site auto deploy on push

See merge request !107
```
  9670a51f
- SUCS Site auto deploy on push · 34804f8d
  Imran Hussain authored Jul 01, 2019
  
  34804f8d
25 Apr, 2019 3 commits
- Merge branch 'beta' into 'sucs-site' · bb7e6d0a
  Tom Lake authored Apr 25, 2019
```
Merge from beta: Correctly extract old user page count from DB

See merge request !106
```
  bb7e6d0a
- Merge branch 'master' into 'beta' · d6fee656
  Tom Lake authored Apr 25, 2019
```
Correctly extract old user page count from DB

See merge request !105
```
  d6fee656
- Correctly extract old user page count from DB · 4e2f8fb7
  Tom Lake authored Apr 25, 2019
  
  4e2f8fb7
06 Feb, 2019 3 commits
- Merge branch 'beta' into 'sucs-site' · c274976e
  Imran Hussain authored Feb 06, 2019
```
Beta to live

See merge request !104
```
  c274976e
- Merge branch 'master' into 'beta' · adbc05b8
  Imran Hussain authored Feb 06, 2019
```
Allow student IDs > 6 digits to beta

See merge request !103
```
  adbc05b8
- [1/?] Allow student IDs > 6 digits · 83f21ec5
  Imran Hussain authored Feb 06, 2019
  
  83f21ec5
24 Jan, 2019 4 commits
- Merge branch 'beta' into 'sucs-site' · 52425b80
  Imran Hussain authored Jan 24, 2019
```
Beta to live!

See merge request !102
```
  52425b80
- Cut a bit too much from motd.php :) · 23899139
  Imran Hussain authored Jan 24, 2019
  
  23899139
- Merge branch 'master' into 'beta' · 51e49732
  Imran Hussain authored Jan 24, 2019
```
Fix motd generation

See merge request !101
```
  51e49732
- Fix motd generation · 4f5034e7
  Imran Hussain authored Jan 24, 2019
  
  4f5034e7
23 Jan, 2019 2 commits
- Merge branch 'beta' into 'sucs-site' · 61bf50a5
  Imran Hussain authored Jan 23, 2019
```
Beta to live!

See merge request !100
```
  61bf50a5
- Merge branch 'master' into 'beta' · d94d8501
  Imran Hussain authored Jan 23, 2019
```
Typos and fixes into beta

See merge request !99
```
  d94d8501