Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Target

Show changes

Only incoming changes from source

Include changes to target since source was created

Commits on Source (20)

Merge changes from beta into live · 8ac335f7
Imran Hussain authored 9 years ago

8ac335f7
merging changes from beta to live · 5d17fd0e
Imran Hussain authored 9 years ago

5d17fd0e
commit changes found on live to the svn · 8fc87a67
Imran Hussain authored 9 years ago

8fc87a67
Merge branch 'beta' into sucs-site · 7cca3ca1
Imran Hussain authored 9 years ago
```
Conflicts:
	htdocs/images/lastsnap.jpg
```
7cca3ca1

Merge branch 'beta' into 'sucs-site' · b2f4bae0

Laurence Sebastian Bowes authored 9 years ago

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

b2f4bae0

Merge branch 'beta' into 'sucs-site' · 815e7049

Imran Hussain authored 9 years ago

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

815e7049

Merge branch 'beta' into 'sucs-site' · 47149d30
Imran Hussain authored 9 years ago
```
Push shirturi box thing fix to live

werks fine in beta

See merge request !17
```
47149d30
Merge branch 'beta' into 'sucs-site' · ba941824
Imran Hussain authored 9 years ago
```
Push postcode fix to live

See merge request !20
```
ba941824
Merge branch 'beta' into 'sucs-site' · 60c314fa
Imran Hussain authored 9 years ago
```
Push changes from beta to live

See merge request !22
```
60c314fa
Merge branch 'beta' into 'sucs-site' · 91a0e647
Imran Hussain authored 9 years ago
```
Push fix from beta to live

See merge request !24
```
91a0e647

Merge branch 'beta' into 'sucs-site' · 2645f0b3

Isabel Jenkins authored 9 years ago

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

2645f0b3

Merge branch 'beta' into 'sucs-site' · 5fe75688
Imran Hussain authored 9 years ago
```
Push changes from beta to live

Beta hasn't exploded.

See merge request !32
```
5fe75688

Merge branch 'beta' into 'sucs-site' · 594f64de

Imran Hussain authored 9 years ago

Push changes from beta to live

Beta didn't blow up and changes work

See merge request !35

594f64de

Merge branch 'beta' into sucs-site · ed2617c1
Imran Hussain authored 9 years ago

ed2617c1
Merge branch 'beta' into sucs-site · 6cf99d62
Imran Hussain authored 9 years ago

6cf99d62
Merge branch 'beta' into sucs-site · 2204d669
Imran Hussain authored 9 years ago

2204d669
Merge branch 'beta' into sucs-site · f8f3c8f3
Imran Hussain authored 9 years ago

f8f3c8f3
Merge branch 'beta' into sucs-site · ebd2ef8d
Imran Hussain authored 8 years ago

ebd2ef8d
Add "enviroments" to the sucssite ci thing. · ec600c36
Imran Hussain authored 8 years ago
```
https://projects.sucs.org/help/ci/environments
```
ec600c36
Merge branch 'beta' into sucs-site · 0dd851cc
Imran Hussain authored 8 years ago

0dd851cc

Hide whitespace changes

Inline Side-by-side

Showing with 0 additions and 0 deletions