Commit Graph

112 Commits

Author SHA1 Message Date
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
c7d47cf446 Merge branch 'lars' into 'master'
Lars

See merge request !154
2017-01-31 10:33:20 +01:00
Lars van Hijfte
4dc3b4f651 Mobile friendly 2017-01-31 10:31:57 +01:00
Lars van Hijfte
0b6ca72dfc Fixed chat date not showing 2017-01-30 16:00:16 +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
44ff3a4cab added time to chat messages 2017-01-30 15:08:07 +01:00
Marijn Jansen
e8c76bef5b Merge branch 'marijn-nietslecht' into 'master'
Marijn nietslecht

See merge request !147
2017-01-30 14:31:17 +01:00
Marijn Jansen
20b951cad2 404 page 2017-01-30 14:30:36 +01:00
Lars van Hijfte
792f346b12 Added admin-panel button 2017-01-30 14:16:11 +01:00
Lars van Hijfte
54ddb78453 Chat receive messages is now better 2017-01-30 13:59:02 +01:00
Marijn Jansen
578ad34020 Picture at nietslecht-button 2017-01-30 13:21:12 +01:00
Lars van Hijfte
c8450f3cb3 Changed profile buttons 2017-01-30 12:44:15 +01:00
Lars van Hijfte
877637fcc9 Added video and links in the chat 2017-01-29 18:29:27 +01:00
Lars van Hijfte
89c8c35b4a Changed profile look a bit more 2017-01-29 17:24:39 +01:00
Lars van Hijfte
c8c81ae730 Merge branch 'master' into lars 2017-01-27 16:03:54 +01:00
Lars van Hijfte
a57465189a Chat post images 2017-01-27 16:03:33 +01:00
Marijn Jansen
2651e0fb2b Merge branch 'joey-testing' into 'master'
Made different files for login and register

See merge request !138
2017-01-27 14:04:39 +01:00
Joey Lai
5e9629eddd Fixed bugs 2017-01-27 14:03:11 +01:00
Joey Lai
609f350cd3 Made different files for login and register 2017-01-27 12:27:40 +01:00
Lars van Hijfte
07c3b07eb3 Merge branch 'lars' into 'master'
Lars

See merge request !137
2017-01-27 12:23:04 +01:00
Lars van Hijfte
f27b9ec6b4 Chat messages split per day 2017-01-27 12:22:26 +01:00
Marijn Jansen
3b542e0878 "Niet slecht."-button! 2017-01-27 12:20:50 +01:00
Marijn Jansen
82c2eaccb3 Merge branch 'master' into marijn-nietslecht 2017-01-27 11:23:42 +01:00
Lars van Hijfte
f1bfc89e6a Custom scrollbar 2017-01-26 22:33:32 +01:00
Marijn Jansen
7073995534 Stop before Genius Bar visit 2017-01-26 17:03:11 +01:00
Lars van Hijfte
637a26ba33 Merge branch 'joey-testing' into 'master'
Modal for register

See merge request !134
2017-01-26 16:18:35 +01:00
Joey Lai
dbdb12cca0 Modal for register 2017-01-26 16:17:58 +01:00
Lars van Hijfte
c1fc022658 Merge branch 'joey-testing' into 'master'
Fixed date and other extras

See merge request !132
2017-01-26 16:13:43 +01:00
Joey Lai
96f70e1a11 Fixed date and other extras 2017-01-26 14:50:41 +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
7b7f0b2c64 Added menu button 2017-01-26 11:48:06 +01:00
Lars van Hijfte
09dac78eb4 Merge branch 'joey-testing' into 'master'
Joey testing

See merge request !123
2017-01-25 16:21:02 +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
Hendrik
b161596d67 polished post viewing 2017-01-25 15:59:03 +01:00
Joey Lai
0b035c0583 Merge branch 'marijn-settings' into joey-testing 2017-01-25 15:48:37 +01:00
Joey Lai
cc08ebec3c Modal added for resetting password 2017-01-25 15:47:31 +01:00
Marijn Jansen
1b2a1a5180 Almost request password 2017-01-25 15:46:20 +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
Marijn Jansen
93ddefa42f Merge branch 'joey-testing' into 'master'
redesigned code

See merge request !115
2017-01-25 11:20:15 +01:00
Joey Lai
981e34c950 redesigned code 2017-01-25 11:19:01 +01:00
Lars van Hijfte
7bf8a16cf0 Dingen door elkaar 2017-01-24 17:06:39 +01:00
Hendrik
b9fc016f7d add post viewing basis, add insert post and comment queries 2017-01-24 16:56:04 +01:00
Lars van Hijfte
0b705df09a Merge branch 'joey-testing' into 'master'
Redesigned register functions

See merge request !107
2017-01-24 15:12:01 +01:00
Joey Lai
7a19fea5f9 Redesigned register functions 2017-01-24 15:08:24 +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