Kevin Nobel
|
99bffc6f47
|
Merge branch 'master' into 'kevin-prototype'
# Conflicts:
# website/queries/friendship.php
# website/queries/user.php
|
2017-01-18 16:22:29 +01:00 |
|
K. Nobel
|
3ee5488a88
|
Improved profile page, profile now takes data from the DB!
|
2017-01-18 16:02:11 +01:00 |
|
K. Nobel
|
e86a6a6d6f
|
Changed queries include
|
2017-01-18 16:01:26 +01:00 |
|
K. Nobel
|
62d77fc616
|
Added query needed to get userID
|
2017-01-18 15:56:59 +01:00 |
|
K. Nobel
|
bdf5c221a7
|
Added queries related to users.
|
2017-01-18 14:23:36 +01:00 |
|
K. Nobel
|
e80ce3b793
|
Improved selectAllFriends query
|
2017-01-18 14:22:03 +01:00 |
|
K. Nobel
|
bb637853ef
|
Merge branch 'master' into kevin-prototype
|
2017-01-17 13:12:43 +01:00 |
|
K. Nobel
|
3901b32e6e
|
Merge branch 'master' into kevin-prototype
|
2017-01-17 12:25:44 +01:00 |
|