Commit Graph

628 Commits

Author SHA1 Message Date
Hendrik 9426f4d6ac add name field check in settings 2017-02-02 15:00:01 +01:00
Lars van Hijfte 7f48cae019 Added uderline in link posts 2017-02-02 14:57:50 +01:00
Lars van Hijfte 33399639b1 Added support for iframe "niet slecht" 2017-02-02 14:51:37 +01:00
Lars van Hijfte 52e40242e6 Added "add group" under group menu 2017-02-02 14:50:51 +01:00
Lars van Hijfte 8a6acbc52a Merge branch 'lars' into 'master'
Lars

See merge request !187
2017-02-02 14:27:49 +01:00
Lars van Hijfte 6fc2f71517 Added meta data in the login page 2017-02-02 14:27:23 +01:00
Lars van Hijfte 1672ce6086 Changed offline status to 5 minutes after inactive 2017-02-02 14:23:36 +01:00
Lars van Hijfte 188741ddf5 BUG FIX: link in fancy text now opens in new tab 2017-02-02 14:22:13 +01:00
K. Nobel 4a7a91ecd9 Fixed bug (not showing profile when on own profile) 2017-02-02 14:20:17 +01:00
Lars van Hijfte 1c1283243c Merge branch 'lars' into 'master'
Lars

See merge request !186
2017-02-02 14:16:56 +01:00
Lars van Hijfte 417124a1fe BUG FIX: added 0 in chat time if needed 2017-02-02 14:13:20 +01:00
Lars van Hijfte d24ed89096 BUG FIX: mobile support fix 2017-02-02 14:04:59 +01:00
Lars van Hijfte a92b0fe892 Merge branch 'hendrik-post' into 'master'
Hendrik post

See merge request !185
2017-02-02 13:58:17 +01:00
Lars van Hijfte 5c1b2d1b21 Merge branch 'kevin-prototype' into 'master'
FIXED VISIBILITY ON PROFILE

See merge request !183
2017-02-02 13:57:44 +01:00
Lars van Hijfte 3abaeba52c Merge branch 'joey-testing' into 'master'
Joey testing

See merge request !182
2017-02-02 13:57:25 +01:00
Hendrik 93e63111de cleaned fix 2017-02-02 13:54:52 +01:00
Hendrik feba1d9786 fix reload after posting post 2017-02-02 13:47:41 +01:00
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
Joey Lai 044ed6a9d3 Added noscript 2017-02-02 13:19:39 +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 04df02862f More Awesome Fonts :D 2017-02-02 10:52:42 +01:00
Joey Lai 67eb7b991e Merge branch 'master' into joey-testing 2017-02-02 10:44:18 +01:00
Joey Lai 90ac38acdd Fixed restrictions with registering 2017-02-02 10:43:34 +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
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 b497538652 Double session_start fixed :D 2017-02-01 14:45:58 +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
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