 Lars van Hijfte
|
ecd24ef442
|
Revert "Merge branch 'joey-testing' into 'master'"
This reverts merge request !196
|
2017-02-03 10:34:07 +01:00 |
|
|
Lars van Hijfte
|
50e94fb8ed
|
Merge branch 'joey-testing' into 'master'
Fixed url
See merge request !196
|
2017-02-03 10:33:47 +01:00 |
|
 Joey Lai
|
127162b938
|
Fixed url
|
2017-02-03 10:32:54 +01:00 |
|
|
Lars van Hijfte
|
820ffb4a62
|
Merge branch 'joey-testing' into 'master'
Fixed W3Validation and url GETs
See merge request !195
|
2017-02-03 10:13:43 +01:00 |
|
|
Joey Lai
|
1a3efe9669
|
Fixed W3Validation and url GETs
|
2017-02-03 10:12:37 +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
|
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 |
|
|
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
|
9165f8fa1b
|
Check if file had been uploaded.
|
2017-02-02 16:18:15 +01:00 |
|
|
Marijn Jansen
|
380d8fa83a
|
Group Shit
|
2017-02-02 16:01: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
|
e60578dc43
|
add unvalidated option and fixed text
|
2017-02-02 15:11:41 +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
|
1c1283243c
|
Merge branch 'lars' into 'master'
Lars
See merge request !186
|
2017-02-02 14:16:56 +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
|
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
|
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
|
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 |
|
|
Lars van Hijfte
|
fb6b392a42
|
Merge branch 'hendrik-post' into 'master'
Hendrik post
See merge request !172
|
2017-02-01 14:19:54 +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 |
|
|
Hendrik
|
9b89058484
|
add infinite scroll on profile
|
2017-02-01 14:05:04 +01:00 |
|
|
Marijn Jansen
|
a643ee19b9
|
Merge branch 'master' into marijn-postdelete
|
2017-02-01 12:56:09 +01:00 |
|
|
Joey Lai
|
700e27e5e3
|
Fixed redirect link and removes test echo's
|
2017-02-01 12:45:26 +01:00 |
|