 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 |
|
|
K. Nobel
|
58bb89f9b4
|
Added queries and functions for adding group members.
|
2017-02-01 12:19:59 +01:00 |
|
 Hendrik
|
fb9d070d6a
|
fixsquared
|
2017-01-31 16:23:13 +01:00 |
|
|
Hendrik
|
52a4822477
|
post-merge fix
|
2017-01-31 16:20:02 +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
|
b41a365b60
|
Age instead of birthday
|
2017-01-31 16:11:20 +01:00 |
|
|
Lars van Hijfte
|
6a7bb4670b
|
Merge branch 'lars' into 'master'
Lars
See merge request !159
|
2017-01-31 16:03:05 +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 |
|
|
Hendrik
|
93200d27c2
|
Merge branch 'master' into hendrik-search
|
2017-01-31 15:32:09 +01:00 |
|
|
Hendrik
|
78e96d5a74
|
add pageselector on search
|
2017-01-31 15:30:48 +01:00 |
|
|
Lars van Hijfte
|
646e6dde48
|
Added max value in text area
|
2017-01-31 15:16:40 +01:00 |
|
|
Lars van Hijfte
|
44408ee429
|
Frozen user cant comment or niet slecht on postst
|
2017-01-31 14:34:51 +01:00 |
|
|
Lars van Hijfte
|
9ca212570d
|
Merge branch 'master' into lars
|
2017-01-31 14:27:50 +01:00 |
|
|
Lars van Hijfte
|
164eb2dde6
|
Frozen users cant chat with other people
|
2017-01-31 14:26:34 +01:00 |
|
|
Lars van Hijfte
|
2dd7dd8140
|
Reload comments bug fix
|
2017-01-31 13:56:34 +01:00 |
|
|
Lars van Hijfte
|
794b5ab294
|
Added fancy text to posts and comments
|
2017-01-31 13:54:31 +01:00 |
|
|
Hendrik
|
eb12b6ba7d
|
fixed pageselector in admin
|
2017-01-31 13:11:23 +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 |
|
|
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 |
|
|
K. Nobel
|
2e71942fdf
|
Merge branch 'master' into kevin-prototype
|
2017-01-31 12:06:58 +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 |
|
|
K. Nobel
|
dee483e946
|
Masonry will now only refresh when the width of the screen changes.
|
2017-01-31 10:54:15 +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
|
b0a8ceafc3
|
Added youtube links
|
2017-01-30 15:40:31 +01:00 |
|
|
K. Nobel
|
54b56da445
|
Merge branch 'master' into kevin-prototype
|
2017-01-30 15:37:57 +01:00 |
|
|
K. Nobel
|
941296802f
|
Added posts to group page.
|
2017-01-30 15:30:08 +01:00 |
|
|
K. Nobel
|
aa12e29948
|
Fixed posts on profile page.
|
2017-01-30 15:29:42 +01:00 |
|
|
K. Nobel
|
1acad8e765
|
modified masonry and posts, masonry is now reusable on group pages.
|
2017-01-30 15:28:54 +01:00 |
|
|
Lars van Hijfte
|
44ff3a4cab
|
added time to chat messages
|
2017-01-30 15:08:07 +01:00 |
|
 Marijn Jansen
|
c840b28495
|
Merge branch 'marijn-404' into 'master'
Resize
See merge request !149
|
2017-01-30 14:34:08 +01:00 |
|
|
Marijn Jansen
|
f1b5a7fe95
|
Resize
|
2017-01-30 14:33:38 +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 |
|