Lars van Hijfte
|
a60a9b6594
|
Merge branch 'master' into lars
|
2017-01-26 14:12:27 +01:00 |
|
Lars van Hijfte
|
59b0b00304
|
Merge branch 'hendrik-post' into 'master'
Hendrik post
See merge request !130
|
2017-01-26 13:47:40 +01:00 |
|
Hendrik
|
51cc736aca
|
Merge branch 'master' into hendrik-post
|
2017-01-26 13:46:24 +01:00 |
|
Lars van Hijfte
|
e24960c319
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !129
|
2017-01-26 13:29:42 +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 |
|
K. Nobel
|
3ebacd6251
|
Fixed masonry grid (posts).
|
2017-01-26 12:20:32 +01:00 |
|
Marijn Jansen
|
423c2fd771
|
Revert "Merge branch 'marijn-settings' into 'master'"
This reverts merge request !128
|
2017-01-26 12:16:28 +01:00 |
|
Marijn Jansen
|
58e5f200fa
|
Merge branch 'marijn-settings' into 'master'
Removed .idea folder
See merge request !128
|
2017-01-26 12:14:52 +01:00 |
|
Marijn Jansen
|
47eed5514a
|
Removed .idea folder
|
2017-01-26 12:14:07 +01:00 |
|
Marijn Jansen
|
78e85c2939
|
Merge branch 'marijn-messagePage' into 'master'
Email confirm and password change now use messagepage function.
See merge request !127
|
2017-01-26 12:06:38 +01:00 |
|
Marijn Jansen
|
44f86a4fbb
|
Email confirm and password change now use messagepage function.
|
2017-01-26 12:05:28 +01:00 |
|
Hendrik
|
328f0665f3
|
add basic post functionality
|
2017-01-26 11:35:18 +01:00 |
|
Lars van Hijfte
|
6a882bf78d
|
Merge branch 'lars' into 'master'
Chat messages and groups are now live.
See merge request !126
|
2017-01-26 10:27:45 +01:00 |
|