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
|
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 |
|
Lars van Hijfte
|
fe190975d5
|
Merge branch 'master' into 'joey-testing'
# Conflicts:
# website/views/homeLoginRegister.php
|
2017-02-03 10:41:05 +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 |
|
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
|
6d739a4480
|
Chat is now only loading the last 100 messages
|
2017-02-03 00:24:38 +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
|
bf298f4b43
|
Merge branch 'marijn-groups' into 'master'
Marijn groups
See merge request !192
|
2017-02-02 19:44:28 +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 |
|
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 |
|
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 |
|
Lars van Hijfte
|
a27a4881c3
|
Merge branch 'lars' into 'master'
Lars
See merge request !189
|
2017-02-02 15:27:27 +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 |
|
Hendrik
|
9426f4d6ac
|
add name field check in settings
|
2017-02-02 15:00:01 +01:00 |
|
Lars van Hijfte
|
7f48cae019
|
Added uderline in link posts
|
2017-02-02 14:57:50 +01:00 |
|
Lars van Hijfte
|
33399639b1
|
Added support for iframe "niet slecht"
|
2017-02-02 14:51:37 +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
|
1672ce6086
|
Changed offline status to 5 minutes after inactive
|
2017-02-02 14:23:36 +01:00 |
|
Lars van Hijfte
|
188741ddf5
|
BUG FIX: link in fancy text now opens in new tab
|
2017-02-02 14:22:13 +01:00 |
|
K. Nobel
|
4a7a91ecd9
|
Fixed bug (not showing profile when on own profile)
|
2017-02-02 14:20:17 +01:00 |
|