Commit Graph

132 Commits

Author SHA1 Message Date
Hendrik
7f31575bfc Merge branch 'master' into hendrik-post 2017-02-01 14:13:55 +01:00
Hendrik
9b89058484 add infinite scroll on profile 2017-02-01 14:05:04 +01:00
Lars van Hijfte
fcd58857c0 Merge branch 'safari-chat' into 'master'
Fixed chat in safari

See merge request !166
2017-02-01 12:29:52 +01:00
Lars van Hijfte
152d72d3d8 Merge branch 'joey-testing' into 'master'
Joey testing

See merge request !164
2017-02-01 12:29:29 +01:00
K. Nobel
3ca7536cc2 Merge branch 'master' into kevin-prototype 2017-02-01 12:27:07 +01:00
K. Nobel
69b0b24176 Fixed group add/leave buttons 2017-02-01 12:26:05 +01:00
Joey Lai
2b893fc283 Facebook ID instead of Facebook email 2017-02-01 12:25:13 +01:00
Marijn Jansen
04365c4f05 Fixed chat in safari 2017-02-01 12:24:59 +01:00
Hendrik
6a9e36cea2 Merge branch 'master' into hendrik-post 2017-02-01 11:49:41 +01:00
Hendrik
64a3b13adf Merge branch 'master' into hendrik-testing 2017-01-31 16:17:42 +01:00
Hendrik
b16dc1d4b7 add bancomment change 2017-01-31 16:15:48 +01:00
Joey Lai
8e98001217 Facebook login implemented 2017-01-31 16:12:22 +01:00
Lars van Hijfte
4d40bb6042 checkbox width fix 2017-01-31 15:46:53 +01:00
Lars van Hijfte
d6c2fab617 Post is now mobile friendly 2017-01-31 15:32:19 +01:00
Lars van Hijfte
794b5ab294 Added fancy text to posts and comments 2017-01-31 13:54:31 +01:00
Lars van Hijfte
f67dd019c4 Inputs are now mobile friendly 2017-01-31 12:47:24 +01:00
Lars van Hijfte
f26097f55f Fixed online status 2017-01-31 12:25:28 +01:00
Hendrik
582d347bcb Merge branch 'master' into hendrik-testing 2017-01-31 12:05:05 +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
Hendrik
a0e77491a2 Merge branch 'master' into hendrik-testing 2017-01-30 16:34:40 +01:00
Hendrik
e464f5bca2 cleaned admin.js, add admin/owner check (frontend), fix submit ajax 2017-01-30 16:32: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
Hendrik
ee204d78a7 minor fixes 2017-01-26 15:32:38 +01:00
Joey Lai
96f70e1a11 Fixed date and other extras 2017-01-26 14:50:41 +01:00