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

[Imran Hussain]

Imran Hussain pushed to branch beta 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

- - - - -


0 changed files:



Changes:


View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/25678b0727d047981e2ee613e31d737f15a61a7b...0dd851cc82847a517bb6d17999da7f24354d5589
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20160920/f3e8edb9/attachment-0001.html>