Lars van Hijfte
|
16b1f93968
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !143
|
2017-01-27 16:13:32 +01:00 |
|
Lars van Hijfte
|
5c1208460f
|
Added direct button on the profile to chat with someone
|
2017-01-26 16:12:50 +01:00 |
|
K. Nobel
|
59fc65e27a
|
Made small changes to posts, added amount of comments and niet slechts
|
2017-01-26 16:09:18 +01:00 |
|
Lars van Hijfte
|
a60a9b6594
|
Merge branch 'master' into lars
|
2017-01-26 14:12:27 +01:00 |
|
Lars van Hijfte
|
33a640329b
|
Filter on search page
It also works with jquery now
|
2017-01-26 13:53:59 +01:00 |
|
K. Nobel
|
cf964ec8d6
|
Merge branch 'master' into kevin-prototype
|
2017-01-26 13:24:16 +01:00 |
|
K. Nobel
|
3ebacd6251
|
Fixed masonry grid (posts).
|
2017-01-26 12:20:32 +01:00 |
|
Lars van Hijfte
|
e1ca3c52ed
|
Merge branch 'hendrik-post' into 'master'
Hendrik post
See merge request !122
|
2017-01-25 16:20:48 +01:00 |
|
Hendrik
|
f06de1e88d
|
Merge branch 'master' into hendrik-post
|
2017-01-25 15:59:40 +01:00 |
|
K. Nobel
|
1402a3ea07
|
Fixed query for image tags
|
2017-01-25 11:19:24 +01:00 |
|
K. Nobel
|
b8f662f825
|
Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB
|
2017-01-24 16:59:14 +01:00 |
|
K. Nobel
|
f9f1e2bf17
|
Changed select posts query.
|
2017-01-24 16:40:30 +01:00 |
|
K. Nobel
|
4967ab6ea0
|
Made some small changes for Lars.
|
2017-01-24 15:01:55 +01:00 |
|
K. Nobel
|
4b3d7967fb
|
Merge branch 'master' into kevin-prototype
|
2017-01-24 14:47:05 +01:00 |
|
K. Nobel
|
d44ddf2793
|
Added functionality for add friend buttons.
|
2017-01-24 14:36:27 +01:00 |
|
Marijn Jansen
|
08c3d73377
|
Merge branch 'master' into 'marijn-settings'
# Conflicts:
# website/views/menu.php
|
2017-01-24 14:02:19 +01:00 |
|
Marijn Jansen
|
c1359920e0
|
New Standard avatar
|
2017-01-24 14:00:55 +01:00 |
|
Hendrik
|
119c82e110
|
minor color and text fixes
|
2017-01-23 16:27:54 +01:00 |
|
Hendrik
|
e6f5044a9a
|
add page functionality
|
2017-01-23 16:04:59 +01:00 |
|
Hendrik
|
9152ae4f75
|
add searching users, searching groups, remembering search options
|
2017-01-20 16:18:09 +01:00 |
|
Hendrik
|
14d96e89ad
|
Merge branch 'master' into hendrik-testing
|
2017-01-20 13:15:06 +01:00 |
|
Hendrik
|
0f02859124
|
fix queries for global and prepared
|
2017-01-20 12:58:34 +01:00 |
|
Lars van Hijfte
|
a2846c392c
|
Merge branch 'master' into lars-algemeen
|
2017-01-20 12:48:22 +01:00 |
|
Lars van Hijfte
|
b6f6c44cea
|
Merge branch 'master' into lars-algemeen
|
2017-01-20 12:26:22 +01:00 |
|
Lars van Hijfte
|
50cec9beed
|
Added things to the menu.
Extra item for a random friend,
If you have no groups, it has a message.
|
2017-01-20 12:25:18 +01:00 |
|
Hendrik
|
c93579913d
|
Merge branch 'master' into hendrik-testing
|
2017-01-20 12:14:17 +01:00 |
|
Hendrik
|
1640d38baa
|
add user page functionality
|
2017-01-19 16:29:38 +01:00 |
|
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 |
|
Hendrik
|
4c9223cba2
|
add user and group batch change
|
2017-01-19 12:57:10 +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 |
|