Hendrik
|
2ff23ae668
|
Merge branch 'master' into hendrik-search
|
2017-01-23 16:06:03 +01:00 |
|
Marijn Jansen
|
449b500636
|
Merge branch 'joey-testing' into 'master'
Fixed css and confirmation for logged in already
See merge request !96
|
2017-01-23 13:26:10 +01:00 |
|
Marijn Jansen
|
af11297fad
|
Merge branch 'marijn-button' into 'master'
Marijn button
See merge request !95
|
2017-01-23 13:25:07 +01:00 |
|
Marijn Jansen
|
46b47d5f8d
|
Merge branch 'master' into marijn-button
|
2017-01-23 13:24:35 +01:00 |
|
Joey Lai
|
21ff896d65
|
Fixed css and confirmation for logged in already
|
2017-01-23 13:24:13 +01:00 |
|
Marijn Jansen
|
86b7e17137
|
new button!
|
2017-01-23 13:24:12 +01:00 |
|
Lars van Hijfte
|
76eb2dee7c
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !94
|
2017-01-23 13:17:57 +01:00 |
|
Lars van Hijfte
|
1ec8de71f0
|
Changed menu view
|
2017-01-23 13:17:01 +01:00 |
|
Lars van Hijfte
|
a165878aa8
|
Merge branch 'master' into lars-algemeen
|
2017-01-23 11:34:09 +01:00 |
|
Lars van Hijfte
|
93b6835ea4
|
Changed style and added friendrequests
|
2017-01-23 11:33:27 +01:00 |
|
Marijn Jansen
|
8ba7583e85
|
Merge branch 'marijn-settings' into 'master'
Changed binParam for bindValue
See merge request !93
|
2017-01-22 11:24:02 +01:00 |
|
Marijn Jansen
|
2a44057233
|
Changed binParam for bindValue
|
2017-01-22 11:23:13 +01:00 |
|
Lars van Hijfte
|
71202ab857
|
Merge branch 'joey-testing' into 'master'
Fixed redirect to profile page after going back 1 page
See merge request !88
|
2017-01-20 16:26:19 +01:00 |
|
Joey Lai
|
95aaba7e7e
|
Merge branch 'joey-testing' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into joey-testing
|
2017-01-20 16:25:38 +01:00 |
|
Joey Lai
|
e33210ce5e
|
Merge branch 'master' into joey-testing
|
2017-01-20 16:24:59 +01:00 |
|
Lars van Hijfte
|
9edf065c81
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !92
|
2017-01-20 16:22:52 +01:00 |
|
Marijn Jansen
|
bf78b80a30
|
Merge branch 'marijn-settings' into 'master'
Kind of works now: Profile update
See merge request !91
|
2017-01-20 16:22:18 +01:00 |
|
Lars van Hijfte
|
3ae00f52bf
|
Merge branch 'master' into lars-algemeen
|
2017-01-20 16:21:54 +01:00 |
|
Marijn Jansen
|
ac96200d16
|
Kind of works now: Profile update
|
2017-01-20 16:20:34 +01:00 |
|
Lars van Hijfte
|
a08e5a346a
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !89
|
2017-01-20 16:20:29 +01:00 |
|
Lars van Hijfte
|
3039839656
|
Merge branch 'hendrik-search' into 'master'
Hendrik search
See merge request !90
|
2017-01-20 16:20:03 +01:00 |
|
Joey Lai
|
e456591db6
|
Merge branch 'master' into joey-testing
|
2017-01-20 16:18:57 +01:00 |
|
K. Nobel
|
a87b5e709b
|
Merge branch 'master' into kevin-prototype
|
2017-01-20 16:18:36 +01:00 |
|
K. Nobel
|
18185020c3
|
Added improvements to profile page.
|
2017-01-20 16:18:12 +01:00 |
|
Lars van Hijfte
|
173ef3e50c
|
Added a notification bar
|
2017-01-20 16:17:56 +01:00 |
|
Joey Lai
|
6ff70440e6
|
history back -> profile.php
|
2017-01-20 16:14:32 +01:00 |
|
Joey Lai
|
82fc1e5266
|
Merge branch 'master' into 'joey-testing'
# Conflicts:
# website/views/login_head.php
|
2017-01-20 16:06:16 +01:00 |
|
Joey Lai
|
e17a55e82d
|
Fixed redirect to profile page after going back 1 page
|
2017-01-20 16:01:08 +01:00 |
|
K. Nobel
|
e7d63c2f57
|
Changed how name is displayed on profile page.
|
2017-01-20 15:34:01 +01:00 |
|