Marijn Jansen
|
7073995534
|
Stop before Genius Bar visit
|
2017-01-26 17:03:11 +01:00 |
|
Marijn Jansen
|
cdfbcc0168
|
Merge branch 'master' into marijn-nietslecht
|
2017-01-26 15:24:55 +01:00 |
|
Marijn Jansen
|
bf87d20985
|
Queries for niet slecht
|
2017-01-26 15:14:51 +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 |
|
Hendrik
|
51cc736aca
|
Merge branch 'master' into hendrik-post
|
2017-01-26 13:46:24 +01:00 |
|
K. Nobel
|
cf964ec8d6
|
Merge branch 'master' into kevin-prototype
|
2017-01-26 13:24:16 +01:00 |
|
Hendrik
|
91aca6baa7
|
change comments to use ajax
|
2017-01-26 12:21:01 +01:00 |
|
Hendrik
|
328f0665f3
|
add basic post functionality
|
2017-01-26 11:35:18 +01:00 |
|
Lars van Hijfte
|
8fb8df075f
|
Added comments
|
2017-01-26 11:31:15 +01:00 |
|
Lars van Hijfte
|
95ee91748f
|
Chat messages and groups are now live.
|
2017-01-26 10:26:40 +01:00 |
|
Lars van Hijfte
|
2ece9e1c63
|
Merge branch 'master' into lars
|
2017-01-25 16:21:34 +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 |
|
Lars van Hijfte
|
91fae80326
|
Friends and friendrequest are fully ajax. Also added friend-item
|
2017-01-25 16:17:46 +01:00 |
|
Hendrik
|
f06de1e88d
|
Merge branch 'master' into hendrik-post
|
2017-01-25 15:59:40 +01:00 |
|
Hendrik
|
b161596d67
|
polished post viewing
|
2017-01-25 15:59:03 +01:00 |
|
K. Nobel
|
977757b2d3
|
Made small improvements to friendship buttons and corresponding API files.
|
2017-01-25 15:42:28 +01:00 |
|
K. Nobel
|
6a43402c66
|
Added comment in getFriendshipStatus for Lars.
|
2017-01-25 15:14:00 +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 |
|
Hendrik
|
db333b6e98
|
add unpolished post viewing
|
2017-01-25 13:28:47 +01:00 |
|
Lars van Hijfte
|
37d83169c6
|
In notification bar accept or deny
|
2017-01-24 17:31:39 +01:00 |
|
Lars van Hijfte
|
7bf8a16cf0
|
Dingen door elkaar
|
2017-01-24 17:06:39 +01:00 |
|
Lars van Hijfte
|
fd055e8355
|
Fixed bugs
|
2017-01-24 15:16:15 +01:00 |
|
Lars van Hijfte
|
a88483ae47
|
FINALLY FIXED THE UNREAD CHAT MESSAGES!
|
2017-01-24 14:26:15 +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
|
61c148e127
|
Made chat xss prove
|
2017-01-20 13:30:40 +01:00 |
|
Lars van Hijfte
|
186cdf1445
|
Made $db global
|
2017-01-19 11:57:54 +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 |
|