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

# Conflicts:
#   website/views/login_head.php

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

..

adminpanel.php

Merge branch 'master' into hendrik-testing

2017-01-20 15:39:44 +01:00

chat-view.php

Made $db global

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

footer.php

Made some pages html valid with a validator

2017-01-16 13:10:34 +01:00

group.php

Added masonry grid to profile and group pages.

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

head.php

Fixed script tags and @import. Has to be absolute path in order to work with the .htaccess file.

2017-01-20 14:48:00 +01:00

header.php

Changed links to absolute path.

2017-01-20 15:02:05 +01:00

homepage.php

Added a header

2017-01-10 16:43:16 +01:00

login_head.php

Merge branch 'master' into 'joey-testing'

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

login-view.php

Changed links to absolute path.

2017-01-20 15:02:05 +01:00

main.php

Added a menu

2017-01-11 11:10:32 +01:00

menu.php

Changed links to absolute path.

2017-01-20 15:02:05 +01:00

profile.php

Changed links to absolute path.

2017-01-20 15:02:05 +01:00

register-view.php

Merge branch 'joey-testing' into 'master'

2017-01-20 15:35:15 +01:00

search-view.php

Restyled the search page

2017-01-13 11:09:09 +01:00

settings-view.php

fixed crosssitescripting on settings pagw

2017-01-20 15:41:13 +01:00