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 |
|
Marijn Jansen
|
7566a756f6
|
Merge branch 'marijn-postdelete' into 'master'
Marijn postdelete
See merge request !171
|
2017-02-01 14:13:04 +01:00 |
|
Marijn Jansen
|
f10d9c14a1
|
Niet slecht small img
|
2017-02-01 14:12:13 +01:00 |
|
Hendrik
|
9b89058484
|
add infinite scroll on profile
|
2017-02-01 14:05:04 +01:00 |
|
Lars van Hijfte
|
61fa0c3781
|
Merge branch 'lars' into 'master'
BUG FIX: Menu now saves the cookie again
See merge request !170
|
2017-02-01 13:10:29 +01:00 |
|
Lars van Hijfte
|
2b98480587
|
BUG FIX: Menu now saves the cookie again
|
2017-02-01 13:07:06 +01:00 |
|
Marijn Jansen
|
a643ee19b9
|
Merge branch 'master' into marijn-postdelete
|
2017-02-01 12:56:09 +01:00 |
|
Lars van Hijfte
|
fcfa6ed9ba
|
Merge branch 'joey-testing' into 'master'
Joey testing
See merge request !169
|
2017-02-01 12:51:12 +01:00 |
|
Joey Lai
|
700e27e5e3
|
Fixed redirect link and removes test echo's
|
2017-02-01 12:45:26 +01:00 |
|
Lars van Hijfte
|
dc69fb493c
|
BUG FIX: Added session start, so posts load again
|
2017-02-01 12:34:27 +01:00 |
|
Lars van Hijfte
|
8e81cec843
|
Merge branch 'lars' into 'master'
Lars
See merge request !165
|
2017-02-01 12:30:08 +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 |
|
Lars van Hijfte
|
7fdf9ad329
|
switch laptop (:
|
2017-02-01 12:20:40 +01:00 |
|
K. Nobel
|
58bb89f9b4
|
Added queries and functions for adding group members.
|
2017-02-01 12:19:59 +01:00 |
|
Hendrik
|
77448d98ba
|
masonry only reloads when columncount changes
|
2017-02-01 11:49:57 +01:00 |
|
Hendrik
|
6a9e36cea2
|
Merge branch 'master' into hendrik-post
|
2017-02-01 11:49:41 +01:00 |
|
Lars van Hijfte
|
6aee603a64
|
Added online status everywhere needed
|
2017-02-01 11:44:21 +01:00 |
|
Lars van Hijfte
|
e414a1633e
|
API filter per user level
|
2017-02-01 11:38:43 +01:00 |
|
Hendrik
|
3c79d86abd
|
add admin search by role
|
2017-02-01 11:33:34 +01:00 |
|
Lars van Hijfte
|
028c2373c1
|
Merge branch 'hendrik-testing' into 'master'
fixsquared
See merge request !163
|
2017-01-31 16:23:41 +01:00 |
|
Hendrik
|
fb9d070d6a
|
fixsquared
|
2017-01-31 16:23:13 +01:00 |
|
Lars van Hijfte
|
e3ad9c4590
|
Merge branch 'hendrik-testing' into 'master'
Hendrik testing
See merge request !162
|
2017-01-31 16:20:36 +01:00 |
|
Marijn Jansen
|
3397253010
|
Merge branch 'marijn-settings' into 'master'
1337 bday
See merge request !161
|
2017-01-31 16:20:08 +01:00 |
|
Hendrik
|
52a4822477
|
post-merge fix
|
2017-01-31 16:20:02 +01:00 |
|
Marijn Jansen
|
c0a64e9ffd
|
1337 bday
|
2017-01-31 16:19:15 +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 |
|
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 |
|