Commit Graph

11 Commits

Author SHA1 Message Date
Lars van Hijfte
8c1bacf894 Styled and rearranged chat-view 2017-01-13 12:01:12 +01:00
Lars van Hijfte
b95aa49c32 Styled chat page
Change the chat tap so it has the same style as the rest of the page
2017-01-12 14:59:29 +01:00
Marijn Jansen
655c2ccbeb Small Ajustments 2017-01-11 16:02:02 +01:00
Marijn Jansen
544db8b608 Merge branch 'marijn-chat' into 'lars-chat'
# Conflicts:
#   website/views/chat-view.php
2017-01-11 15:31:49 +01:00
Lars van Hijfte
0f562bd39c Fixed chat size.
It is all fixed, litteraly.
2017-01-11 15:29:47 +01:00
Marijn Jansen
1e6e454de4 Small changes 2017-01-11 15:26:01 +01:00
Marijn Jansen
38079cbcaf Added Friend list in chat. 2017-01-11 14:38:07 +01:00
Marijn Jansen
eecdcad538 "before merge" 2017-01-11 14:04:04 +01:00
Marijn Jansen
17d1f96a02 Merge with current master 2017-01-11 11:14:07 +01:00
Marijn Jansen
b973e666da Fixed spacing on the chat page. 2017-01-10 20:58:56 +01:00
Marijn Jansen
cf240ca656 Almost a chatpage! 2017-01-10 17:08:40 +01:00