Marijn Jansen 96f421d088 Merge branch 'master' into 'marijn-postdelete' ...

# Conflicts:
#   website/public/js/masonry.js

2017-02-01 14:41:45 +01:00

..

Facebook

Facebook login implemented

2017-01-31 16:12:22 +01:00

alerts.php

Fixed and spilt Avatar upload and Alerts

2017-01-31 13:36:32 +01:00

calcAge.php

Added age calculation

2017-01-29 13:09:22 +01:00

checkInput.php

Facebook ID instead of Facebook email

2017-02-01 12:25:13 +01:00

connect.php

Changed db connect and database query structure so PhpStorm can detect it.

2017-01-29 14:01:25 +01:00

emailconfirm.php

Changed db connect and database query structure so PhpStorm can detect it.

2017-01-29 14:01:25 +01:00

friendship.php

Fixed online status

2017-01-31 12:25:28 +01:00

group_member.php

Merge branch 'lars' into 'master'

2017-02-01 12:30:08 +01:00

group_page.php

Added queries and functions for adding group members.

2017-02-01 12:19:59 +01:00

header.php

Changed db connect and database query structure so PhpStorm can detect it.

2017-01-29 14:01:25 +01:00

login.php

Fixed redirect link and removes test echo's

2017-02-01 12:45:26 +01:00

nicetime.php

Changed db connect and database query structure so PhpStorm can detect it.

2017-01-29 14:01:25 +01:00

picture.php

Fixed and spilt Avatar upload and Alerts

2017-01-31 13:36:32 +01:00

post.php

Merge branch 'master' into 'marijn-postdelete'

2017-02-01 14:41:45 +01:00

private_message.php

Added fancy text to posts and comments

2017-01-31 13:54:31 +01:00

register.php

Fixed redirect link and removes test echo's

2017-02-01 12:45:26 +01:00

requestpassword.php

Changed db connect and database query structure so PhpStorm can detect it.

2017-01-29 14:01:25 +01:00

settings.php

Fixed and spilt Avatar upload and Alerts

2017-01-31 13:36:32 +01:00

user.php

Added online status everywhere needed

2017-02-01 11:44:21 +01:00