Lars van Hijfte
|
ab21226925
|
Merge branch 'master' into lars
|
2017-02-03 00:14:03 +01:00 |
|
Lars van Hijfte
|
7e4107ac8b
|
Added fancy buttons in profile
|
2017-02-03 00:13:23 +01:00 |
|
Marijn Jansen
|
de96ae8263
|
Merge branch 'marijn-groups' into 'master'
Add mods/admin to a group.
See merge request !194
|
2017-02-02 21:14:59 +01:00 |
|
Marijn Jansen
|
74e91ed7cb
|
Add mods/admin to a group.
|
2017-02-02 21:14:25 +01:00 |
|
Lars van Hijfte
|
e9468b0ec8
|
Merge branch 'master' into lars
|
2017-02-02 21:04:32 +01:00 |
|
Lars van Hijfte
|
839fb247b4
|
Merge branch 'joey-testing' into 'master'
Added url get
See merge request !193
|
2017-02-02 21:03:03 +01:00 |
|
Marijn Jansen
|
74145d5d1c
|
Updated buttons on groups
|
2017-02-02 19:43:57 +01:00 |
|
Joey Lai
|
1486e71207
|
Added url get
|
2017-02-02 19:34:58 +01:00 |
|
Lars van Hijfte
|
b206d243b9
|
Validator fixes
Changes chat, profile and settings pages so it is compatible with the validator of w3
|
2017-02-02 18:17:58 +01:00 |
|
Lars van Hijfte
|
4f731e12fe
|
Merge branch 'master' into lars
|
2017-02-02 17:45:10 +01:00 |
|
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
|
93b908fb13
|
Merge branch 'kevin-prototype' into 'master'
Redirect to 404 from profile and group
See merge request !190
|
2017-02-02 16:47:06 +01:00 |
|
Marijn Jansen
|
6fd5401c86
|
Merge branch 'marijn-groups' into 'master'
Marijn groups
See merge request !191
|
2017-02-02 16:19:03 +01:00 |
|
Marijn Jansen
|
380d8fa83a
|
Group Shit
|
2017-02-02 16:01:45 +01:00 |
|
K. Nobel
|
28254d98e4
|
Merge branch 'master' into kevin-prototype
|
2017-02-02 15:38:39 +01:00 |
|
K. Nobel
|
8a3cfebf55
|
Redirect to 404 from profile and group
|
2017-02-02 15:34:45 +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 |
|
Hendrik
|
cfa7c870f0
|
fix profile error color
|
2017-02-02 15:13:35 +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
|
8a6acbc52a
|
Merge branch 'lars' into 'master'
Lars
See merge request !187
|
2017-02-02 14:27:49 +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
|
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 |
|
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
|
96f421d088
|
Merge branch 'master' into 'marijn-postdelete'
# Conflicts:
# website/public/js/masonry.js
|
2017-02-01 14:41:45 +01:00 |
|