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
|
833bfd3292
|
Merge branch 'lars' into 'master'
Lars
See merge request !209
|
2017-02-03 12:42:15 +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 |
|
Joey Lai
|
05d6bf8aa6
|
Added fbModal button
|
2017-02-03 11:47:16 +01:00 |
|
Marijn Jansen
|
e3f4fa0b3c
|
Favicon
|
2017-02-03 11:42:16 +01:00 |
|
Lars van Hijfte
|
16f83d93ce
|
Merge branch 'lars' into 'master'
Lars
See merge request !206
|
2017-02-03 11:21:12 +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 |
|
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
|
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 |
|
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 |
|
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 |
|
Joey Lai
|
c8dbdfe70e
|
Fixed url
|
2017-02-03 10:34:44 +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 |
|
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
|
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 |
|
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 |
|