K. Nobel
|
3ca7536cc2
|
Merge branch 'master' into kevin-prototype
|
2017-02-01 12:27:07 +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 |
|
Lars van Hijfte
|
83f75e0282
|
Merge branch 'lars' into 'master'
Age instead of birthday
See merge request !160
|
2017-01-31 16:11:47 +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
|
7236a8ba35
|
Merge branch 'hendrik-search' into 'master'
Hendrik search
See merge request !158
|
2017-01-31 16:02:29 +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 |
|
Marijn Jansen
|
1c9c88e030
|
Fixed and spilt Avatar upload and Alerts
|
2017-01-31 13:36:32 +01:00 |
|
Hendrik
|
eb12b6ba7d
|
fixed pageselector in admin
|
2017-01-31 13:11:23 +01:00 |
|
Lars van Hijfte
|
e85a685b0f
|
Merge branch 'master' into lars
|
2017-01-31 12:47:51 +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 |
|
Hendrik
|
582d347bcb
|
Merge branch 'master' into hendrik-testing
|
2017-01-31 12:05:05 +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 |
|