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 |
|
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
|
60b55b3f04
|
Added comments
Also hiding the mail/age if said so by the user
|
2017-02-02 10:29:49 +01:00 |
|
Marijn Jansen
|
e299ef59e8
|
Added show profile into settings
|
2017-02-02 10:28:12 +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 |
|
Lars van Hijfte
|
89cff4da8c
|
Merge branch 'master' into lars
|
2017-02-01 14:20:03 +01:00 |
|
Marijn Jansen
|
fc07027405
|
Merge branch 'master' into marijn-postdelete
|
2017-02-01 14:16:52 +01:00 |
|
Lars van Hijfte
|
b7a6fae4d9
|
BUG FIX: Menu loading
Menu's now load slower but update when needed.
Also frozen users now catch the forbidden error
|
2017-02-01 14:14:49 +01:00 |
|
Hendrik
|
7f31575bfc
|
Merge branch 'master' into hendrik-post
|
2017-02-01 14:13:55 +01:00 |
|
Marijn Jansen
|
d87d0b7295
|
Backend for delete post
|
2017-02-01 14:13:22 +01:00 |
|
Hendrik
|
9b89058484
|
add infinite scroll on profile
|
2017-02-01 14:05:04 +01:00 |
|
Lars van Hijfte
|
2b98480587
|
BUG FIX: Menu now saves the cookie again
|
2017-02-01 13:07:06 +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
|
77448d98ba
|
masonry only reloads when columncount changes
|
2017-02-01 11:49:57 +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
|
6a7bb4670b
|
Merge branch 'lars' into 'master'
Lars
See merge request !159
|
2017-01-31 16:03:05 +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
|
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 |
|
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
|
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 |
|
Lars van Hijfte
|
792f346b12
|
Added admin-panel button
|
2017-01-30 14:16:11 +01:00 |
|