Marijn Jansen ab8c12c9d8 Merge branch 'master' into 'marijn-settings' ...

# Conflicts:
#   website/queries/settings.php

2017-01-18 14:52:32 +01:00

..

adminpanel.php

minor fixes

2017-01-13 10:46:09 +01:00

chat-view.php

Styled and rearranged chat-view

2017-01-13 12:01:12 +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

Setting loadin, settings update, db is now global

2017-01-17 16:47:49 +01:00

header.php

Restyled the search page

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

homepage.php

Added a header

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

login_head.php

Splitted login and register pages

2017-01-18 09:19:38 +01:00

login-view.php

Splitted login and register pages

2017-01-18 09:19:38 +01:00

main.php

Added a menu

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

menu.php

Added group_page functions for the admin page

2017-01-17 14:44:20 +01:00

profile.php

Added masonry grid to profile and group pages.

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

register-view.php

Almost finished login/register page

2017-01-18 12:35:41 +01:00

search-view.php

Restyled the search page

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

settings-view.php

settings succes mesages

2017-01-18 14:51:03 +01:00