Joey Lai 82fc1e5266 Merge branch 'master' into 'joey-testing' ...

# Conflicts:
#   website/views/login_head.php

2017-01-20 16:06:16 +01:00

..

admin.js

move js to /js

2017-01-20 13:14:28 +01:00

chat.js

Made chat xss prove

2017-01-20 13:30:40 +01:00

dobPicker.js

rename html folder to public

2017-01-13 14:44:45 +01:00

dobPicker.min.js

rename html folder to public

2017-01-13 14:44:45 +01:00

header.js

rename html folder to public

2017-01-13 14:44:45 +01:00

jquery.js

rename html folder to public

2017-01-13 14:44:45 +01:00

masonry.js

Added masonry grid to profile and group pages.

2017-01-17 12:25:09 +01:00

menu.js

fixed menu more friends bug

2017-01-18 16:12:38 +01:00

registerAndLogin.js

Fixed redirect to profile page after going back 1 page

2017-01-20 16:01:08 +01:00