K. Nobel
|
2f1bbd0a8e
|
Merge branch 'master' into kevin-prototype
|
2017-01-19 16:07:14 +01:00 |
|
K. Nobel
|
56b17675fa
|
Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB
|
2017-01-19 16:04:07 +01:00 |
|
K. Nobel
|
84719529bb
|
Fixed queries and profile page.
|
2017-01-19 12:01:39 +01:00 |
|
Lars van Hijfte
|
186cdf1445
|
Made $db global
|
2017-01-19 11:57:54 +01:00 |
|
K. Nobel
|
b37d06e2cc
|
Updated queries
|
2017-01-19 11:55:23 +01:00 |
|
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
|
880db2d325
|
Merge branch 'master' into kevin-prototype
|
2017-01-18 16:20:15 +01:00 |
|
Hendrik
|
e7e3ae9c8b
|
add changing single group status
|
2017-01-18 15:57:39 +01:00 |
|
K. Nobel
|
62d77fc616
|
Added query needed to get userID
|
2017-01-18 15:56:59 +01:00 |
|
Hendrik
|
71dc7bae2c
|
add group search, add user individual actions
|
2017-01-18 15:19:07 +01:00 |
|
K. Nobel
|
bdf5c221a7
|
Added queries related to users.
|
2017-01-18 14:23:36 +01:00 |
|
Hendrik
|
b5ceb1b5e0
|
add pagetype selector, add search filter
|
2017-01-18 14:20:32 +01:00 |
|
Hendrik
|
8ce6cd1aa2
|
add rudimentary search
|
2017-01-17 16:23:44 +01:00 |
|
Hendrik
|
146fc7108b
|
add usersearch query
|
2017-01-17 15:13:32 +01:00 |
|