Hendrik search #162

Merged
11342374 merged 10 commits from hendrik-search into master 2017-01-31 16:02:35 +01:00

10 Commits

Author SHA1 Message Date
Hendrik
93200d27c2 Merge branch 'master' into hendrik-search 2017-01-31 15:32:09 +01:00
Marijn Jansen
2a37b9c64d Merge branch 'kevin-prototype' into 'master'
Fixed posts on group pages.

See merge request !156
2017-01-31 13:54:30 +01:00
Marijn Jansen
dfdf72daf4 Merge branch 'marijn-postPicture' into 'master'
Fixed and spilt Avatar upload and Alerts

See merge request !157
2017-01-31 13:38:30 +01:00
Marijn Jansen
1c9c88e030 Fixed and spilt Avatar upload and Alerts 2017-01-31 13:36:32 +01:00
K. Nobel
6b13db9c4f Fixed posting on group pages. 2017-01-31 12:53:45 +01:00
K. Nobel
c14a2770bd Fixed posting functions for groups. 2017-01-31 12:52:50 +01:00
K. Nobel
2e71942fdf Merge branch 'master' into kevin-prototype 2017-01-31 12:06:58 +01:00
K. Nobel
dee483e946 Masonry will now only refresh when the width of the screen changes. 2017-01-31 10:54:15 +01:00
K. Nobel
6e6bbf8d92 Merge branch 'master' into kevin-prototype 2017-01-30 20:19:24 +01:00
K. Nobel
3140242b4f Removed old query for posts. 2017-01-30 16:24:07 +01:00