Commit Graph

152 Commits

Author SHA1 Message Date
Lars van Hijfte
820ffb4a62 Merge branch 'joey-testing' into 'master'
Fixed W3Validation and url GETs

See merge request !195
2017-02-03 10:13:43 +01:00
Joey Lai
1a3efe9669 Fixed W3Validation and url GETs 2017-02-03 10:12:37 +01:00
Marijn Jansen
74145d5d1c Updated buttons on groups 2017-02-02 19:43:57 +01:00
Lars van Hijfte
b1941f0191 Merge branch 'hendrik-testing' into 'master'
add name field check in settings

See merge request !188
2017-02-02 15:27:39 +01:00
Hendrik
cfa7c870f0 fix profile error color 2017-02-02 15:13:35 +01:00
Lars van Hijfte
7f48cae019 Added uderline in link posts 2017-02-02 14:57:50 +01:00
Lars van Hijfte
a92b0fe892 Merge branch 'hendrik-post' into 'master'
Hendrik post

See merge request !185
2017-02-02 13:58:17 +01:00
Lars van Hijfte
3abaeba52c Merge branch 'joey-testing' into 'master'
Joey testing

See merge request !182
2017-02-02 13:57:25 +01:00
Hendrik
6ed19d9060 Merge branch 'master' into hendrik-post 2017-02-02 13:43:31 +01:00
Hendrik
d4d16661df added alert box when emptpy posting 2017-02-02 13:42:59 +01:00
Joey Lai
044ed6a9d3 Added noscript 2017-02-02 13:19:39 +01:00
Lars van Hijfte
487e0a0523 Merge branch 'lars' into 'master'
Lars

See merge request !180
2017-02-02 12:46:42 +01:00
Lars van Hijfte
1dfc14e6f0 Added meta data 2017-02-02 12:44:03 +01:00
Marijn Jansen
04df02862f More Awesome Fonts :D 2017-02-02 10:52:42 +01:00
Lars van Hijfte
12d5e00731 Merge branch 'hendrik-testing' into 'master'
Hendrik testing

See merge request !173
2017-02-01 14:52:03 +01:00
Lars van Hijfte
0546b8689d BUG FIX: name size 2017-02-01 14:51:27 +01:00
Marijn Jansen
96f421d088 Merge branch 'master' into 'marijn-postdelete'
# Conflicts:
#   website/public/js/masonry.js
2017-02-01 14:41:45 +01:00
Marijn Jansen
dbfe10f84b Delete Posts! 2017-02-01 14:34:02 +01:00
Hendrik
022893aca2 Merge branch 'master' into hendrik-testing 2017-02-01 14:24:27 +01:00
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
3c79d86abd add admin search by role 2017-02-01 11:33:34 +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