Commit Graph

702 Commits

Author SHA1 Message Date
Lars van Hijfte f8c9454b85 empty SessionID sends the user to login page
If the session is empty, it now sends you to the login page with a safed url so it can revert you back to the right page after login
2017-02-02 17:43:32 +01:00
Lars van Hijfte b1941f0191 Merge branch 'hendrik-testing' into 'master'
add name field check in settings

See merge request !188
2017-02-02 15:27:39 +01:00
Lars van Hijfte a27a4881c3 Merge branch 'lars' into 'master'
Lars

See merge request !189
2017-02-02 15:27:27 +01:00
Hendrik cfa7c870f0 fix profile error color 2017-02-02 15:13:35 +01:00
Hendrik e60578dc43 add unvalidated option and fixed text 2017-02-02 15:11:41 +01:00
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
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 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
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 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