Joey Lai
|
8d70804155
|
Merge branch 'joey-testing' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into joey-testing
|
2017-02-03 10:52:35 +01:00 |
|
Joey Lai
|
0ac12f5110
|
Merge branch 'master' into joey-testing
|
2017-02-03 10:48:14 +01:00 |
|
Lars van Hijfte
|
fe190975d5
|
Merge branch 'master' into 'joey-testing'
# Conflicts:
# website/views/homeLoginRegister.php
|
2017-02-03 10:41:05 +01:00 |
|
Joey Lai
|
c8dbdfe70e
|
Fixed url
|
2017-02-03 10:34:44 +01:00 |
|
Lars van Hijfte
|
ecd24ef442
|
Revert "Merge branch 'joey-testing' into 'master'"
This reverts merge request !196
|
2017-02-03 10:34:07 +01:00 |
|
Joey Lai
|
127162b938
|
Fixed url
|
2017-02-03 10:32:54 +01:00 |
|
Joey Lai
|
1a3efe9669
|
Fixed W3Validation and url GETs
|
2017-02-03 10:12:37 +01:00 |
|
Joey Lai
|
1486e71207
|
Added url get
|
2017-02-02 19:34:58 +01:00 |
|
Joey Lai
|
90ac38acdd
|
Fixed restrictions with registering
|
2017-02-02 10:43:34 +01:00 |
|
Joey Lai
|
700e27e5e3
|
Fixed redirect link and removes test echo's
|
2017-02-01 12:45:26 +01:00 |
|
Joey Lai
|
2b893fc283
|
Facebook ID instead of Facebook email
|
2017-02-01 12:25:13 +01:00 |
|