Hendrik
|
3152839dae
|
add javascript for userlist tablehead checkall box, fix pageselector css
|
2017-01-20 12:06:23 +01:00 |
|
Joey Lai
|
44bbbfeaae
|
fixed ;
|
2017-01-20 12:01:27 +01:00 |
|
Joey Lai
|
66e4fa189c
|
added echo
|
2017-01-20 11:58:33 +01:00 |
|
Joey Lai
|
dfc04be8b6
|
added script to window.onload
|
2017-01-20 11:56:30 +01:00 |
|
Joey Lai
|
db2fb1b353
|
added checked already logged in function
|
2017-01-20 11:51:50 +01:00 |
|
Joey Lai
|
5e31590403
|
Fixed include checkinput.php
|
2017-01-20 11:19:54 +01:00 |
|
K. Nobel
|
56b17675fa
|
Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB
|
2017-01-19 16:04:07 +01:00 |
|
Lars van Hijfte
|
7792ceaeeb
|
Merge branch 'joey-testing' into 'master'
Functions with validating
See merge request !71
|
2017-01-19 15:59:00 +01:00 |
|
Joey Lai
|
64ea5d3f68
|
Functions with validating
|
2017-01-19 15:55:28 +01:00 |
|
Lars van Hijfte
|
f5fa36c09c
|
added 404 image
|
2017-01-19 14:55:58 +01:00 |
|
Lars van Hijfte
|
cd1a2855de
|
Merge branch 'marijn-settings' into 'master'
Marijn settings
See merge request !69
|
2017-01-19 13:56:39 +01:00 |
|
Marijn Jansen
|
dd0c9b35e9
|
No autologin
|
2017-01-19 13:53:49 +01:00 |
|
Marijn Jansen
|
d27538a164
|
Email change implemented!
|
2017-01-19 13:44:47 +01:00 |
|
Lars van Hijfte
|
e71054c654
|
Merge branch 'joey-testing' into 'master'
Fixed login/register and added logout.php
See merge request !68
|
2017-01-19 13:37:56 +01:00 |
|
Joey Lai
|
049dee6381
|
Fixed login/register and added logout.php
|
2017-01-19 13:11:24 +01:00 |
|
Hendrik
|
4c9223cba2
|
add user and group batch change
|
2017-01-19 12:57:10 +01:00 |
|
K. Nobel
|
84719529bb
|
Fixed queries and profile page.
|
2017-01-19 12:01:39 +01:00 |
|
Lars van Hijfte
|
186cdf1445
|
Made $db global
|
2017-01-19 11:57:54 +01:00 |
|
Lars van Hijfte
|
b71cf36798
|
Fixed chat
It now has a userID again,
displays which user you are chatting withhover over user changes different background
|
2017-01-19 11:08:55 +01:00 |
|
Hendrik
|
c4d78e54bc
|
fixed form with get, fix accompanying css
|
2017-01-19 11:08:45 +01:00 |
|
Marijn Jansen
|
ff19b5e1b9
|
Settings messages now uses a Class (:
|
2017-01-19 11:01:29 +01:00 |
|
Marijn Jansen
|
f5a6b401a8
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !62
|
2017-01-18 16:23:36 +01:00 |
|
Lars van Hijfte
|
28061671d8
|
Merge branch 'lars-chat' into 'master'
added this file because it is needed
See merge request !63
|
2017-01-18 16:22:39 +01:00 |
|
Kevin Nobel
|
99bffc6f47
|
Merge branch 'master' into 'kevin-prototype'
# Conflicts:
# website/queries/friendship.php
# website/queries/user.php
|
2017-01-18 16:22:29 +01:00 |
|
Lars van Hijfte
|
380b256d29
|
added this file because it is needed
|
2017-01-18 16:20:33 +01:00 |
|
Lars van Hijfte
|
fddeba821d
|
Merge branch 'lars-chat' into 'master'
fixed menu more friends bug
See merge request !61
|
2017-01-18 16:13:36 +01:00 |
|
Lars van Hijfte
|
d06ad5a44d
|
fixed menu more friends bug
|
2017-01-18 16:12:38 +01:00 |
|
K. Nobel
|
3ee5488a88
|
Improved profile page, profile now takes data from the DB!
|
2017-01-18 16:02:11 +01:00 |
|
Hendrik
|
38e5b28ff5
|
Merge branch 'master' into hendrik-testing
|
2017-01-18 16:02:02 +01:00 |
|
Lars van Hijfte
|
32ff271b5e
|
Merge branch 'lars-chat' into 'master'
Lars chat
See merge request !59
|
2017-01-18 15:55:41 +01:00 |
|
Marijn Jansen
|
b95705df29
|
Merge branch 'joey-testing' into 'master'
Fixed login link
See merge request !58
|
2017-01-18 15:54:36 +01:00 |
|
Lars van Hijfte
|
df9f782809
|
Friends in the menu now redirects to the users profile.
|
2017-01-18 15:54:13 +01:00 |
|
Joey Lai
|
455705e286
|
Fixed login link
|
2017-01-18 15:53:10 +01:00 |
|
Lars van Hijfte
|
7469a10f13
|
Fixed Chat!
|
2017-01-18 15:37:49 +01:00 |
|
Marijn Jansen
|
097ccf49b3
|
New Button
|
2017-01-18 15:27:51 +01:00 |
|
Hendrik
|
71dc7bae2c
|
add group search, add user individual actions
|
2017-01-18 15:19:07 +01:00 |
|
Marijn Jansen
|
34c4b11efb
|
"Deze finctie werkt nog niet"
|
2017-01-18 15:18:08 +01:00 |
|
Lars van Hijfte
|
cd954a8c4c
|
Merge branch 'master' into lars-chat
|
2017-01-18 15:10:17 +01:00 |
|
Lars van Hijfte
|
95fd3c0040
|
chat is done?
|
2017-01-18 15:09:52 +01:00 |
|
Marijn Jansen
|
e7ceb254ce
|
No standard marijn user
|
2017-01-18 14:57:16 +01:00 |
|
Marijn Jansen
|
ab8c12c9d8
|
Merge branch 'master' into 'marijn-settings'
# Conflicts:
# website/queries/settings.php
|
2017-01-18 14:52:32 +01:00 |
|
Marijn Jansen
|
e73fcd420c
|
settings succes mesages
|
2017-01-18 14:51:03 +01:00 |
|
Joey Lai
|
0808d46d9e
|
Added salting and no similar username
|
2017-01-18 14:46:32 +01:00 |
|
Lars van Hijfte
|
19f525d168
|
Live chatting now shows up in the chat-history
|
2017-01-18 14:34:15 +01:00 |
|
Hendrik
|
b5ceb1b5e0
|
add pagetype selector, add search filter
|
2017-01-18 14:20:32 +01:00 |
|
Joey Lai
|
afcd048260
|
Almost finished login/register page
|
2017-01-18 12:35:41 +01:00 |
|
Lars van Hijfte
|
eb2a343d5f
|
added live sending messages from user 2 to user 2
|
2017-01-18 12:08:53 +01:00 |
|
Marijn Jansen
|
dde463df6c
|
Added password change
|
2017-01-18 10:43:54 +01:00 |
|
Marijn Jansen
|
51378bf386
|
Merge branch 'joey-testing' into 'master'
Splitted login and register pages
See merge request !54
|
2017-01-18 09:21:10 +01:00 |
|
Joey Lai
|
9b4743d25a
|
Splitted login and register pages
|
2017-01-18 09:19:38 +01:00 |
|