 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 |
|
|
Lars van Hijfte
|
1193078e8f
|
Merge branch 'kevin-prototype' into 'master'
Added comments to javascript code
See merge request !211
|
2017-02-03 21:19:50 +01:00 |
|
 K. Nobel
|
bcb01e3296
|
Merge branch 'master' into kevin-prototype
|
2017-02-03 13:22:59 +01:00 |
|
|
K. Nobel
|
7cc6450e6a
|
Added comments to javascript code.
|
2017-02-03 13:19:00 +01:00 |
|
 Joey Lai
|
4643dfcddb
|
Fixed comments and links
|
2017-02-03 12:42:30 +01:00 |
|
|
Lars van Hijfte
|
833bfd3292
|
Merge branch 'lars' into 'master'
Lars
See merge request !209
|
2017-02-03 12:42:15 +01:00 |
|
|
Lars van Hijfte
|
1ac6a7da87
|
Changed admin checkbox buttons
|
2017-02-03 12:40:33 +01:00 |
|
|
Lars van Hijfte
|
52ce787241
|
Merge remote-tracking branch 'origin/hendrik-testing' into lars
|
2017-02-03 12:34:19 +01:00 |
|
|
Lars van Hijfte
|
fb5f76c499
|
?
|
2017-02-03 12:32:57 +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 |
|
|
Joey Lai
|
05d6bf8aa6
|
Added fbModal button
|
2017-02-03 11:47:16 +01:00 |
|
 Marijn Jansen
|
1e60941a3f
|
Merge branch 'marijn-favicon' into 'master'
Favicon
See merge request !207
|
2017-02-03 11:42:40 +01:00 |
|
|
Marijn Jansen
|
e3f4fa0b3c
|
Favicon
|
2017-02-03 11:42:16 +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
|
16f83d93ce
|
Merge branch 'lars' into 'master'
Lars
See merge request !206
|
2017-02-03 11:21:12 +01:00 |
|
|
Lars van Hijfte
|
306fd3090f
|
Merge branch 'hendrik-testing' into 'master'
removed session id lol
See merge request !205
|
2017-02-03 11:20:24 +01:00 |
|
|
Hendrik
|
771567660c
|
removed session id lol
|
2017-02-03 11:19:06 +01:00 |
|
|
Lars van Hijfte
|
4eae09dfc7
|
Merge branch 'master' into lars
|
2017-02-03 11:19:02 +01:00 |
|
|
Lars van Hijfte
|
53e1d7fef3
|
Fixed admin layout
|
2017-02-03 11:18:32 +01:00 |
|
|
Lars van Hijfte
|
c29be662bc
|
Session logout now works
|
2017-02-03 11:18:17 +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 |
|
|
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 |
|
|
Lars van Hijfte
|
1862369013
|
Merge branch 'joey-testing' into 'master'
Joey testing
See merge request !200
|
2017-02-03 10:54:47 +01:00 |
|
|
Joey Lai
|
8d70804155
|
Merge branch 'joey-testing' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into joey-testing
|
2017-02-03 10:52:35 +01:00 |
|
|
Joey Lai
|
0ac12f5110
|
Merge branch 'master' into joey-testing
|
2017-02-03 10:48:14 +01:00 |
|
|
Lars van Hijfte
|
5e8fa6791f
|
Merge branch 'joey-testing' into 'master'
Fixed url
See merge request !198
|
2017-02-03 10:45:33 +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 |
|
|
Lars van Hijfte
|
fe190975d5
|
Merge branch 'master' into 'joey-testing'
# Conflicts:
# website/views/homeLoginRegister.php
|
2017-02-03 10:41:05 +01:00 |
|
|
Hendrik
|
0f202088a1
|
Merge branch 'master' into hendrik-testing
|
2017-02-03 10:40:44 +01:00 |
|
|
Lars van Hijfte
|
87b0ab5892
|
Merge branch 'lars' into 'master'
Lars
See merge request !199
|
2017-02-03 10:40:16 +01:00 |
|
|
Joey Lai
|
c8dbdfe70e
|
Fixed url
|
2017-02-03 10:34:44 +01:00 |
|
|
Lars van Hijfte
|
8949d14a5e
|
Merge branch 'revert-50e94fb8' into 'master'
Revert "Merge branch 'joey-testing' into 'master'"
See merge request !197
|
2017-02-03 10:34:39 +01:00 |
|
|
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 |
|
|
Hendrik
|
fde736b8c5
|
misc
|
2017-02-03 10:33:44 +01:00 |
|
|
Joey Lai
|
127162b938
|
Fixed url
|
2017-02-03 10:32:54 +01:00 |
|
|
Lars van Hijfte
|
02349dbe28
|
Changed description
|
2017-02-03 10:30:44 +01:00 |
|
|
Lars van Hijfte
|
da01729b61
|
Merge branch 'master' into lars
|
2017-02-03 10:15:10 +01:00 |
|