Lars van Hijfte
|
4eae09dfc7
|
Merge branch 'master' into lars
|
2017-02-03 11:19:02 +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 |
|
Lars van Hijfte
|
d260bf04bc
|
Merge branch 'hendrik-testing' into 'master'
Hendrik testing
See merge request !204
|
2017-02-03 11:16:36 +01:00 |
|
Hendrik
|
a0ef234b79
|
Merge branch 'master' into hendrik-testing
|
2017-02-03 11:15:01 +01:00 |
|
Hendrik
|
da061de226
|
validated adminpanel, added shown friends limit in profile.
|
2017-02-03 11:14:03 +01:00 |
|
Marijn Jansen
|
f18088d8d2
|
Merge branch 'marijn-groups' into 'master'
Comments
See merge request !203
|
2017-02-03 11:13:46 +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
|
bb352c7a7a
|
merge
|
2017-02-03 10:41:29 +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 |
|
Hendrik
|
afb45d6709
|
add closing of modal on escape key and clicking outside
|
2017-02-02 15:51:27 +01:00 |
|