K. Nobel
|
4a7a91ecd9
|
Fixed bug (not showing profile when on own profile)
|
2017-02-02 14:20:17 +01:00 |
|
K. Nobel
|
328ce69144
|
Merge branch 'master' into kevin-prototype
|
2017-02-02 13:15:29 +01:00 |
|
K. Nobel
|
9d675dd897
|
Fixed default image for group members.
|
2017-02-02 13:11:05 +01:00 |
|
K. Nobel
|
86b02973e4
|
Fixed visibility on profiles
|
2017-02-02 13:02:00 +01:00 |
|
Lars van Hijfte
|
ab5f243281
|
Merge branch 'lars' into 'master'
BUG FIX: username doesn't cut off in link
See merge request !181
|
2017-02-02 12:53:13 +01:00 |
|
Lars van Hijfte
|
327a6a8f5c
|
BUG FIX: username doesn't cut off in link
|
2017-02-02 12:52:03 +01:00 |
|
Lars van Hijfte
|
d03d58ce37
|
Merge branch 'hendrik-search' into 'master'
Hendrik search
See merge request !177
|
2017-02-02 12:47:05 +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
|
cc9866d3dd
|
Merge branch 'marijn-settings' into 'master'
More Awesome Fonts :D
See merge request !179
|
2017-02-02 10:54:10 +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
|
70b7e12559
|
Merge branch 'marijn-settings' into 'master'
Added show profile into settings
See merge request !178
|
2017-02-02 10:28:54 +01:00 |
|
Marijn Jansen
|
e299ef59e8
|
Added show profile into settings
|
2017-02-02 10:28:12 +01:00 |
|
Hendrik
|
d9c68d5f5f
|
Merge branch 'master' into hendrik-search
|
2017-02-02 10:27:21 +01:00 |
|
Hendrik
|
d027333bd7
|
fix filter and pagenumber interaction in search
|
2017-02-02 01:06:31 +01:00 |
|
Lars van Hijfte
|
12d5e00731
|
Merge branch 'hendrik-testing' into 'master'
Hendrik testing
See merge request !173
|
2017-02-01 14:52:03 +01:00 |
|
Lars van Hijfte
|
0546b8689d
|
BUG FIX: name size
|
2017-02-01 14:51:27 +01:00 |
|
Marijn Jansen
|
eb8eb5bf03
|
Merge branch 'marijn-postdelete' into 'master'
Double session_start fixed :D
See merge request !176
|
2017-02-01 14:46:31 +01:00 |
|
Marijn Jansen
|
b497538652
|
Double session_start fixed :D
|
2017-02-01 14:45:58 +01:00 |
|
Marijn Jansen
|
6ad1c0edf5
|
Merge branch 'marijn-postdelete' into 'master'
Marijn postdelete
See merge request !174
|
2017-02-01 14:42:02 +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 |
|
Lars van Hijfte
|
7955509cb2
|
Merge branch 'lars' into 'master'
Lars
See merge request !175
|
2017-02-01 14:35:01 +01:00 |
|
Marijn Jansen
|
dbfe10f84b
|
Delete Posts!
|
2017-02-01 14:34:02 +01:00 |
|
K. Nobel
|
6c43cae1cb
|
Added noposts div to group.
|
2017-02-01 14:31:18 +01:00 |
|
K. Nobel
|
3af38cd088
|
Merge branch 'master' into kevin-prototype
|
2017-02-01 14:28:39 +01:00 |
|
K. Nobel
|
cfe2928f7b
|
Fixed member list
|
2017-02-01 14:28:03 +01:00 |
|
Hendrik
|
022893aca2
|
Merge branch 'master' into hendrik-testing
|
2017-02-01 14:24:27 +01:00 |
|
Lars van Hijfte
|
89cff4da8c
|
Merge branch 'master' into lars
|
2017-02-01 14:20:03 +01:00 |
|
Lars van Hijfte
|
fb6b392a42
|
Merge branch 'hendrik-post' into 'master'
Hendrik post
See merge request !172
|
2017-02-01 14:19:54 +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 |
|
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
|
bccb813e92
|
Merge branch 'lars' into 'master'
BUG FIX: Added session start, so posts load again
See merge request !168
|
2017-02-01 12:36:16 +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 |
|
Lars van Hijfte
|
a9c27583e4
|
Merge branch 'kevin-prototype' into 'master'
GROUP BUTTONS AND GROUP STYLE
See merge request !167
|
2017-02-01 12:29:08 +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 |
|