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

# Conflicts:
#   website/views/menu.php

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

..

adminpanel.php

Changed admin layout and fixed for enums

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

chat-view.php

New Standard avatar

2017-01-24 14:00:55 +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

Changed style and added friendrequests

2017-01-23 11:33:27 +01:00

header.php

Merge branch 'master' into lars-chat

2017-01-23 17:08:43 +01:00

homepage.php

Added a header

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

login_head.php

Fixed css and confirmation for logged in already

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

Merge branch 'master' into 'marijn-settings'

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

notification-center.php

Changed style and added friendrequests

2017-01-23 11:33:27 +01:00

profile.php

Added improvements to profile page.

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

register-view.php

Merge branch 'joey-testing' into 'master'

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

search-view.php

add page functionality

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

settings-view.php

Changed Alerts to Exceptions.

2017-01-24 12:12:48 +01:00