Marijn Jansen 08c3d73377 Merge branch 'master' into 'marijn-settings' ...

# Conflicts:
#   website/views/menu.php

2017-01-24 14:02:19 +01:00

..

checkInput.php

fixed spelling

2017-01-20 11:25:38 +01:00

connect.php

Added password change

2017-01-18 10:43:54 +01:00

friendship.php

Merge branch 'master' into 'marijn-settings'

2017-01-24 14:02:19 +01:00

group_member.php

Menu, netjes, notification

2017-01-23 16:24:48 +01:00

group_page.php

add page functionality

2017-01-23 16:04:59 +01:00

header.php

New Standard avatar

2017-01-24 14:00:55 +01:00

login.php

Merge branch 'joey-testing' into 'master'

2017-01-19 13:37:56 +01:00

nicetime.php

Fixed profile page, now shows current user when no username is given in get variable.

2017-01-20 13:07:47 +01:00

private_message.php

Made $db global

2017-01-19 11:57:54 +01:00

register.php

Fixed login/register and added logout.php

2017-01-19 13:11:24 +01:00

settings.php

Checks and resize on profile pictures :)

2017-01-24 13:54:08 +01:00

user.php

Merge branch 'master' into 'marijn-settings'

2017-01-24 14:02:19 +01:00