Lars van Hijfte
|
327a6a8f5c
|
BUG FIX: username doesn't cut off in link
|
2017-02-02 12:52:03 +01:00 |
|
Lars van Hijfte
|
60b55b3f04
|
Added comments
Also hiding the mail/age if said so by the user
|
2017-02-02 10:29:49 +01:00 |
|
Lars van Hijfte
|
0546b8689d
|
BUG FIX: name size
|
2017-02-01 14:51:27 +01:00 |
|
Lars van Hijfte
|
f26097f55f
|
Fixed online status
|
2017-01-31 12:25:28 +01:00 |
|
Lars van Hijfte
|
d5d9d5857a
|
Rip website?
|
2017-01-31 11:50:05 +01:00 |
|
Lars van Hijfte
|
6831994ede
|
Merge branch 'lars' into 'master'
Lars
See merge request !152
|
2017-01-30 15:41:32 +01:00 |
|
Lars van Hijfte
|
54ddb78453
|
Chat receive messages is now better
|
2017-01-30 13:59:02 +01:00 |
|
Marijn Jansen
|
b24fed57d9
|
Changed db connect and database query structure so PhpStorm can detect it.
|
2017-01-29 14:01:25 +01:00 |
|
Lars van Hijfte
|
33a640329b
|
Filter on search page
It also works with jquery now
|
2017-01-26 13:53:59 +01:00 |
|
Lars van Hijfte
|
2ece9e1c63
|
Merge branch 'master' into lars
|
2017-01-25 16:21:34 +01:00 |
|
Lars van Hijfte
|
91fae80326
|
Friends and friendrequest are fully ajax. Also added friend-item
|
2017-01-25 16:17:46 +01:00 |
|
K. Nobel
|
95570c49d4
|
Merge branch 'master' into kevin-prototype
|
2017-01-25 15:08:34 +01:00 |
|
K. Nobel
|
9ff256429d
|
Changed friendship buttons. We now use AJAX, changed button style and added FA icons.
|
2017-01-25 15:06:37 +01:00 |
|
Lars van Hijfte
|
37d83169c6
|
In notification bar accept or deny
|
2017-01-24 17:31:39 +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 |
|
Lars van Hijfte
|
dc11830c80
|
Fixed name length
|
2017-01-24 14:32:43 +01:00 |
|
Lars van Hijfte
|
dbb23922d8
|
Merge branch 'master' into lars-chat
|
2017-01-24 14:26:48 +01:00 |
|
Lars van Hijfte
|
a88483ae47
|
FINALLY FIXED THE UNREAD CHAT MESSAGES!
|
2017-01-24 14:26:15 +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 |
|
Lars van Hijfte
|
58ce5f1e75
|
Menu, netjes, notification
|
2017-01-23 16:24:48 +01:00 |
|
Lars van Hijfte
|
93b6835ea4
|
Changed style and added friendrequests
|
2017-01-23 11:33:27 +01:00 |
|
Lars van Hijfte
|
173ef3e50c
|
Added a notification bar
|
2017-01-20 16:17:56 +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 |
|
Lars van Hijfte
|
b71cf36798
|
Fixed chat
It now has a userID again,
displays which user you are chatting withhover over user changes different background
|
2017-01-19 11:08:55 +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 |
|
Lars van Hijfte
|
95fd3c0040
|
chat is done?
|
2017-01-18 15:09:52 +01:00 |
|
K. Nobel
|
e80ce3b793
|
Improved selectAllFriends query
|
2017-01-18 14:22:03 +01:00 |
|
Lars van Hijfte
|
6385324b13
|
The menu now backend supported
It loads the friends and groups of userID 2 by default (only if there is no session userID set
|
2017-01-17 14:16:17 +01:00 |
|
Lars van Hijfte
|
10d3e177ae
|
Begin with the connection between php and mysql.
It has a template that loads all the friends of userID 666.
It uses a connect.php and a friendship.php
|
2017-01-17 12:48:01 +01:00 |
|