 Lars van Hijfte
|
490d39ba47
|
Merge branch 'joey-testing' into 'master'
Added fbModal button
See merge request !208
|
2017-02-03 21:20:25 +01:00 |
|
 Joey Lai
|
4643dfcddb
|
Fixed comments and links
|
2017-02-03 12:42:30 +01:00 |
|
|
Lars van Hijfte
|
52ce787241
|
Merge remote-tracking branch 'origin/hendrik-testing' into lars
|
2017-02-03 12:34:19 +01:00 |
|
 Hendrik
|
f3aebddfea
|
commentses
|
2017-02-03 12:21:37 +01:00 |
|
|
Lars van Hijfte
|
3aae884bb5
|
Added comments
|
2017-02-03 12:12:16 +01:00 |
|
|
Hendrik
|
b07d0712aa
|
Merge branch 'marijn-groups' into hendrik-testing
|
2017-02-03 12:08:42 +01:00 |
|
|
Lars van Hijfte
|
1fd984cc02
|
Merge branch 'marijn-groups' into lars
|
2017-02-03 11:31:58 +01:00 |
|
 Marijn Jansen
|
6d5de98c1d
|
comments
|
2017-02-03 11:31:18 +01:00 |
|
|
Lars van Hijfte
|
000d1f4072
|
Merge branch 'joey-testing' into 'master'
fixed login
See merge request !202
|
2017-02-03 11:16:48 +01:00 |
|
|
Hendrik
|
a0ef234b79
|
Merge branch 'master' into hendrik-testing
|
2017-02-03 11:15:01 +01:00 |
|
|
Marijn Jansen
|
f18088d8d2
|
Merge branch 'marijn-groups' into 'master'
Comments
See merge request !203
|
2017-02-03 11:13:46 +01:00 |
|
|
Marijn Jansen
|
ac2ce3d07b
|
Merge branch 'master' into marijn-groups
|
2017-02-03 11:13:20 +01:00 |
|
|
Joey Lai
|
ba6f86e70e
|
fixed login
|
2017-02-03 11:12:30 +01:00 |
|
|
Marijn Jansen
|
c69b5d8ed3
|
Comments
|
2017-02-03 11:12:02 +01:00 |
|
|
Marijn Jansen
|
5de3a84683
|
Merge branch 'marijn-groups' into 'master'
Marijn groups
See merge request !201
|
2017-02-03 10:59:35 +01:00 |
|
|
Marijn Jansen
|
b8d6136a9d
|
Added deadmin!
|
2017-02-03 10:59:10 +01:00 |
|
|
Marijn Jansen
|
28e9269b52
|
Delete groups
|
2017-02-03 10:44:50 +01:00 |
|
|
Hendrik
|
0f202088a1
|
Merge branch 'master' into hendrik-testing
|
2017-02-03 10:40:44 +01:00 |
|
|
Hendrik
|
fde736b8c5
|
misc
|
2017-02-03 10:33:44 +01:00 |
|
|
Lars van Hijfte
|
da01729b61
|
Merge branch 'master' into lars
|
2017-02-03 10:15:10 +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 |
|
|
Lars van Hijfte
|
6d739a4480
|
Chat is now only loading the last 100 messages
|
2017-02-03 00:24:38 +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 |
|
|
Joey Lai
|
1486e71207
|
Added url get
|
2017-02-02 19:34:58 +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
|
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 |
|
 K. Nobel
|
1c53eab2fa
|
Fixed user group list on profile page.
|
2017-02-02 15:50:12 +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 |
|
|
Hendrik
|
9426f4d6ac
|
add name field check in settings
|
2017-02-02 15:00:01 +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
|
1672ce6086
|
Changed offline status to 5 minutes after inactive
|
2017-02-02 14:23:36 +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 |
|
|
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 |
|
|
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 |
|