[SUCS Devel] [Git][sucssite/sucs-site][master] 31 commits: Creating a beta branch which is what beta.sucs.org will run

[Imran Hussain]

Imran Hussain pushed to branch master at sucssite / sucs-site


Commits:
52942db7 by Imran Hussain at 2015-04-05T17:50:22+00:00
Creating a beta branch which is what beta.sucs.org will run

- - - - -
b2dd9343 by Imran Hussain at 2015-04-13T19:00:08+00:00
Merge 664/665 into beta

- - - - -
600e07c5 by Imran Hussain at 2015-04-14T18:21:35+00:00
Merge changes from trunk into beta

- - - - -
954841a2 by Imran Hussain at 2015-04-14T19:22:26+00:00
Merge changes from trunk into beta

- - - - -
8776bf00 by Imran Hussain at 2015-04-14T19:33:54+00:00
Merge changes from trunk into beta

- - - - -
a35f1529 by Imran Hussain at 2015-04-19T10:46:51+00:00
Merge changes into beta

- - - - -
700c14bb by Imran Hussain at 2015-04-19T12:50:43+00:00
Merging chnages from live site into trunk and beta

- - - - -
20c58208 by Imran Hussain at 2015-04-21T10:27:31+00:00
merge changes from trunk into beta

- - - - -
01f89fc0 by Imran Hussain at 2015-04-22T12:22:22+00:00
merging changes from trunk to beta

- - - - -
f59ad92e by Imran Hussain at 2015-06-06T22:22:43+01:00
Merge branch 'master' into 'beta'

Merge changes from master (tunk) into beta

sucs-site (live) is ahead of beta :/

Pushing merge changes (the new fancy way) from master (trunk) into the beat branch.

See merge request !1

- - - - -
3262b072 by Imran Hussain at 2015-09-16T15:52:20+01:00
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

- - - - -
0088ed5e by Robert Scott James at 2015-09-17T14:27:20+01:00
Merge branch 'master' into 'beta'

Remove lastsnap from the repo

!5 brought up this issue.

See merge request !6

- - - - -
6d4a65e5 by Imran Hussain at 2015-09-24T13:46:06+01:00
Merge branch 'master' into 'beta'

Deploy bugfixes into beta

We've had a few bug fixes that are ready to be tested on beta.

See merge request !11

- - - - -
d13fa5d2 by Imran Hussain at 2015-09-24T19:12:24+01:00
Merge branch 'master' into 'beta'

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

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

See merge request !14

- - - - -
af3d9f58 by Imran Hussain at 2015-09-25T16:07:52+01:00
Merge branch 'master' into 'beta'

Fix short uri page not displaying the box thing properly.

Horrible hack that works for now. To be gotten rid of in redesign.

See merge request !16

- - - - -
aac2527b by Imran Hussain at 2015-09-27T18:05:44+01:00
Merge branch 'master' into 'beta'

Push postcode lookup fix to beta

The title.

See merge request !19

- - - - -
2d78cf85 by Imran Hussain at 2015-09-29T20:02:58+01:00
Merge branch 'master' into 'beta'

Auto add users to printer when they sign up because I hate doign it manualy and …

…it takes a long time to do it manualy and I make mistakes and peopel complain and stuff.

See merge request !21

- - - - -
bb38f105 by Imran Hussain at 2015-09-30T14:50:31+01:00
Merge branch 'master' into 'beta'

I am stupid

See merge request !23

- - - - -
35e66dbf by Imran Hussain at 2015-10-12T12:12:33+01:00
Merge branch 'master' into 'beta'

Push SUAPIv2 code to beta

See merge request !27

- - - - -
4bedb335 by Imran Hussain at 2015-10-13T16:18:00+01:00
Merge branch 'master' into 'beta'

Deploy changes from dev to beta for public testing

See merge request !31

- - - - -
bc305a95 by Imran Hussain at 2015-10-20T16:38:17+01:00
Merge branch 'master' into 'beta'

Push Signup validation changes to beta

They seem to work on my local copy.

Time for public testing.

See merge request !34

- - - - -
fc8a4561 by Imran Hussain at 2015-11-05T11:12:07+00:00
Merge branch 'master' into beta.

Gitlab is a bit borked atm so a manual cli merge is needed

- - - - -
e4f93ace by Imran Hussain at 2015-11-09T11:02:25+00:00
Merge branch 'master' into beta

- - - - -
2e977a59 by Imran Hussain at 2015-12-01T18:22:12+00:00
Merge branch 'master' into beta

- - - - -
1ef2605c by Imran Hussain at 2015-12-04T14:52:47+00:00
Merge branch 'master' into beta

- - - - -
4795e418 by Imran Hussain at 2015-12-21T18:28:05+00:00
Merge branch 'master' into beta

- - - - -
ec709448 by Imran Hussain at 2016-03-12T16:28:13+00:00
Merge branch 'master' into beta

- - - - -
5d6c6eed by Imran Hussain at 2016-05-30T20:17:08+01:00
Merge branch 'master' into beta

- - - - -
8132522d by Imran Hussain at 2016-07-15T11:00:51+01:00
Add "enviroments" to the sucssite ci thing.

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

- - - - -
25678b07 by Imran Hussain at 2016-09-05T20:26:16+01:00
Merge branch 'master' into beta

- - - - -
ac65d5d0 by Imran Hussain at 2016-09-20T16:11:55+01:00
Merge branch 'beta'

- - - - -


0 changed files:



Changes:


View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/419d3d7c2f5ddf87e48057476cfe8baaecb937ae...ac65d5d0504103ed20a7c09491d9cc2b77bff919
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20160920/024022ac/attachment-0001.html>