[SUCS Devel] [Git][sucssite/sucs-site][master] 68 commits: Merge changes from beta into live

Isabel Jenkins unreturnable at sucs.org
Fri Oct 20 17:59:13 BST 2017 

Isabel Jenkins pushed to branch master at sucssite / sucs-site


Commits:
8ac335f7 by Imran Hussain at 2015-04-21T10:39:30+00:00
Merge changes from beta into live

- - - - -
5d17fd0e by Imran Hussain at 2015-04-22T12:23:26+00:00
merging changes from beta to live

- - - - -
8fc87a67 by Imran Hussain at 2015-05-22T20:58:32+00:00
commit changes found on live to the svn

- - - - -
7cca3ca1 by Imran Hussain at 2015-09-17T14:38:10+01:00
Merge branch 'beta' into sucs-site

Conflicts:
	htdocs/images/lastsnap.jpg

- - - - -
b2f4bae0 by Laurence Sebastian Bowes at 2015-09-24T13:55:01+01:00
Merge branch 'beta' into 'sucs-site'

Deploy bugfixes into live

The bugixes seem to be working in a production like environment.

Nothing seems to be broken because of them.

See merge request !12

- - - - -
815e7049 by Imran Hussain at 2015-09-25T13:39:01+01:00
Merge branch 'beta' into 'sucs-site'

Push "Disable cert checking when talking to the SU-API" onto live

Code hasn't exploded and it fixes the problem we have.

See merge request !15

- - - - -
47149d30 by Imran Hussain at 2015-09-25T16:10:36+01:00
Merge branch 'beta' into 'sucs-site'

Push shirturi box thing fix to live

werks fine in beta

See merge request !17

- - - - -
ba941824 by Imran Hussain at 2015-09-27T18:07:47+01:00
Merge branch 'beta' into 'sucs-site'

Push postcode fix to live

See merge request !20

- - - - -
60c314fa by Imran Hussain at 2015-09-29T20:14:11+01:00
Merge branch 'beta' into 'sucs-site'

Push changes from beta to live

See merge request !22

- - - - -
91a0e647 by Imran Hussain at 2015-09-30T14:51:01+01:00
Merge branch 'beta' into 'sucs-site'

Push fix from beta to live

See merge request !24

- - - - -
2645f0b3 by Peter Jenkins at 2015-10-12T15:22:07+01:00
Merge branch 'beta' into 'sucs-site'

Push SU-APIv2 stuff to live

The code seems to work pretty well on beta.

Do other people want to test it?

See merge request !28

- - - - -
5fe75688 by Imran Hussain at 2015-10-13T17:14:00+01:00
Merge branch 'beta' into 'sucs-site'

Push changes from beta to live

Beta hasn't exploded.

See merge request !32

- - - - -
594f64de by Imran Hussain at 2015-10-20T18:52:29+01:00
Merge branch 'beta' into 'sucs-site'

Push changes from beta to live

Beta didn't blow up and changes work

See merge request !35

- - - - -
ed2617c1 by Imran Hussain at 2015-11-05T12:06:07+00:00
Merge branch 'beta' into sucs-site

- - - - -
6cf99d62 by Imran Hussain at 2015-11-09T11:10:13+00:00
Merge branch 'beta' into sucs-site

- - - - -
2204d669 by Imran Hussain at 2016-01-02T22:04:04+00:00
Merge branch 'beta' into sucs-site

- - - - -
f8f3c8f3 by Imran Hussain at 2016-03-12T16:33:47+00:00
Merge branch 'beta' into sucs-site

- - - - -
ebd2ef8d by Imran Hussain at 2016-05-30T20:17:36+01:00
Merge branch 'beta' into sucs-site

- - - - -
ec600c36 by Imran Hussain at 2016-07-15T10:51:24+01:00
Add "enviroments" to the sucssite ci thing.

https://projects.sucs.org/help/ci/environments

- - - - -
0dd851cc by Imran Hussain at 2016-09-05T20:28:07+01:00
Merge branch 'beta' into sucs-site

- - - - -
03035be4 by Imran Hussain at 2016-09-20T16:14:44+01:00
Merge branch 'master' into beta

- - - - -
13e9a0fd by Imran Hussain at 2016-09-20T16:15:56+01:00
Merge branch 'beta' into sucs-site

- - - - -
a297fa5b by Imran Hussain at 2016-10-03T16:31:19+01:00
fix suapi

- - - - -
6c713711 by Imran Hussain at 2016-10-03T16:36:24+01:00
fix suapi

- - - - -
44dc89b9 by Imran Hussain at 2016-10-03T19:50:27+01:00
Write a function to work around broken msl shit

- - - - -
2d1b2e2b by Imran Hussain at 2016-10-03T19:51:06+01:00
Write a function to work around broken msl shit

- - - - -
ebdaebc6 by Imran Hussain at 2016-10-13T11:01:05+01:00
Fix old student members coming back with the same student id after thier account has been deleted and they paid via the su

- - - - -
0d379349 by Imran Hussain at 2016-10-13T11:01:05+01:00
It's not my morning...

- - - - -
8bf3ac4b by Imran Hussain at 2016-10-13T11:01:44+01:00
Fix old student members coming back with the same student id after thier account has been deleted and they paid via the su

- - - - -
ff575957 by Imran Hussain at 2016-10-13T11:01:44+01:00
It's not my morning...

- - - - -
ce20e662 by Imran Hussain at 2016-10-13T14:14:38+01:00
Don't need to check if they aren't in the singup table if we know they aren't in the members table

- - - - -
7eee2a8f by Imran Hussain at 2016-10-13T14:14:45+01:00
Don't need to check if they aren't in the singup table if we know they aren't in the members table

- - - - -
0a08e6fa by Imran Hussain at 2017-01-21T19:15:34+00:00
Merge branch 'master' into 'beta'

Master

See merge request !52
- - - - -
4f12c56e by Imran Hussain at 2017-01-21T19:30:36+00:00
Merge branch 'master' into 'beta'

Getting the name of our secretary helps!

See merge request !54
- - - - -
9a485814 by Andy Pover at 2017-01-21T20:06:18+00:00
Merge branch 'beta' into 'sucs-site'

Beta hasn't exploded, lets push these to live

See merge request !55
- - - - -
70eb93ea by Imran Hussain at 2017-03-31T12:21:40+01:00
Merge branch 'master' into beta

- - - - -
3e35d149 by Imran Hussain at 2017-03-31T12:40:17+01:00
Merge branch 'beta' into sucs-site

- - - - -
92f40d62 by Imran Hussain at 2017-04-01T18:32:28+01:00
Merge branch 'master' into beta

- - - - -
40c1079f by Imran Hussain at 2017-04-01T18:33:45+01:00
Merge branch 'beta' into sucs-site

- - - - -
e9f4c2f2 by Imran Hussain at 2017-06-30T12:35:30+01:00
Switch to using debian jessie docker image

- - - - -
f02fdd0a by Imran Hussain at 2017-06-30T12:37:47+01:00
That didn't work so lets go back to using the default ruby image and test php against php7

- - - - -
264f2e52 by Imran Hussain at 2017-06-30T12:43:38+01:00
npm is part of nodejs

- - - - -
c37b71d1 by Imran Hussain at 2017-06-30T12:46:42+01:00
install nodejs from the main site, debian stable packages are screweed up

- - - - -
5f3d26d1 by Imran Hussain at 2017-06-30T12:48:51+01:00
need curl, doh!

- - - - -
270d2208 by Imran Hussain at 2017-06-30T12:50:36+01:00
forgot a -y

- - - - -
cfc77876 by Imran Hussain at 2017-06-30T12:53:31+01:00
nodejs install that is supposed to install deps doesn't actually do so, install gnupg manually

- - - - -
43ea7d60 by Imran Hussain at 2017-06-30T12:59:07+01:00
the script to install nodejs DOESN'T INSTALL NODEJS!

- - - - -
c0a4eedb by Imran Hussain at 2017-06-30T13:17:02+01:00
Switch to using debian jessie docker image

- - - - -
2fb3504b by Imran Hussain at 2017-06-30T13:17:03+01:00
That didn't work so lets go back to using the default ruby image and test php against php7

- - - - -
e21e849b by Imran Hussain at 2017-06-30T13:17:03+01:00
npm is part of nodejs

- - - - -
6ae8257c by Imran Hussain at 2017-06-30T13:17:03+01:00
install nodejs from the main site, debian stable packages are screweed up

- - - - -
b3af94da by Imran Hussain at 2017-06-30T13:17:03+01:00
need curl, doh!

- - - - -
02750371 by Imran Hussain at 2017-06-30T13:17:03+01:00
forgot a -y

- - - - -
c749c42b by Imran Hussain at 2017-06-30T13:17:03+01:00
nodejs install that is supposed to install deps doesn't actually do so, install gnupg manually

- - - - -
058a41c2 by Imran Hussain at 2017-06-30T13:17:03+01:00
the script to install nodejs DOESN'T INSTALL NODEJS!

- - - - -
c4c4b758 by Imran Hussain at 2017-09-21T16:52:08+01:00
Merge branch 'master' into beta

- - - - -
b02c75c6 by Imran Hussain at 2017-09-26T11:38:53+01:00
Update sucs iss ldap info for signup system 
- - - - -
653b406c by Imran Hussain at 2017-09-26T11:50:09+01:00
shitty iss dropped uid for EDUPERSONTARGETEDID

- - - - -
7a325c26 by Kit Manners at 2017-09-27T10:49:34+01:00
Fix typo in signup completion

- - - - -
68a40e7c by Kit Manners at 2017-09-27T10:49:34+01:00
Fix retrieving full name from campus ldap

- - - - -
459d1ed8 by Kit Manners at 2017-09-27T10:49:34+01:00
Add missing space in error message

- - - - -
b9db1f21 by gigosaurus at 2017-09-27T10:49:34+01:00
Remember the student number if they entered it in a previous form

- - - - -
bf07b4e4 by Imran Hussain at 2017-09-27T10:51:36+01:00
if you're a student then you don't get to choose your real name

- - - - -
de4a21e5 by gigosaurus at 2017-09-27T10:52:49+01:00
Fix signup validation. Emails, names and addresses are now much less strict, and more valid postcodes are allowed.

- - - - -
5c2bcecf by Kit Manners at 2017-09-27T12:37:39+01:00
Fix retrieving student number

- - - - -
68376cf8 by Ciaran Crocker at 2017-10-20T17:49:07+01:00
Merge branch 'sucs-site'

- - - - -
3b3b9d96 by Ciaran Crocker at 2017-10-20T17:50:37+01:00
Merge branch 'master' into beta

- - - - -
198abcdb by Isabel Jenkins at 2017-10-20T17:59:07+01:00
Merge branch 'master' into 'master'

Tidy up branches (2/3)

See merge request sucssite/sucs-site!70
- - - - -


0 changed files:



Changes:


View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/2b0cf0ed9426f05f79a9feb6289bf326296a464c...198abcdbe08cf01bbd15669dd76133edd0bca0b6

---
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/2b0cf0ed9426f05f79a9feb6289bf326296a464c...198abcdbe08cf01bbd15669dd76133edd0bca0b6
You're receiving this email because of your account on projects.sucs.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20171020/403cc5ee/attachment-0001.html>

More information about the Devel mailing list