Commit Graph

17 Commits

Author SHA1 Message Date
Lars van Hijfte
a71cb8adb6 Fixed some extra things 2017-01-19 14:53:12 +01:00
Lars van Hijfte
e71054c654 Merge branch 'joey-testing' into 'master'
Fixed login/register and added logout.php

See merge request !68
2017-01-19 13:37:56 +01:00
Joey Lai
049dee6381 Fixed login/register and added logout.php 2017-01-19 13:11:24 +01:00
Marijn Jansen
1fb6c90fa6 Session Start doubble fixes 2017-01-18 16:41:45 +01:00
Marijn Jansen
e4ec666e03 Added personal Header 2017-01-18 16:22:27 +01:00
Lars van Hijfte
057275d513 Restyled the search page
Split users and groups
added a search button
made some boxes required
2017-01-13 11:09:09 +01:00
Marijn Jansen
c15643128a Merge branch 'lars-algemeen' into 'master'
Lars algemeen

See merge request !26
2017-01-12 15:02:51 +01:00
Lars van Hijfte
2434ffc675 Added filter on the search page. 2017-01-12 12:20:47 +01:00
Marijn Jansen
06c24ec096 Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-settings 2017-01-12 11:36:26 +01:00
Marijn Jansen
319a406d6f Added settings page. 2017-01-12 11:00:44 +01:00
Lars van Hijfte
1912e11f76 Added href to the links.
Zoek -> search.php
Instellingen -> settings.php
Uitloggen -> login.php
2017-01-12 10:44:58 +01:00
Marijn Jansen
a2f51aa05e Updated Header links 2017-01-11 15:36:55 +01:00
Lars van Hijfte
24e0673caa Added extra functions to the header.
A text button was added to go directly to the DM's and if you click your profile picture it pups up some links to go to.
2017-01-11 13:49:54 +01:00
Lars van Hijfte
c354bdb330 fixed merge 2017-01-11 11:13:04 +01:00
Lars van Hijfte
e90ecda436 Added a menu
It contains a list of friends and a "more" button.
This also offsets the content to the right.
2017-01-11 11:10:32 +01:00
Marijn Jansen
8b74917b21 New Logo 2017-01-11 10:56:03 +01:00
Lars van Hijfte
f8d66720bd Added a header
Logo, searchbar without functionality and a profile picture. Also gave the content a margin downward because of the header.
2017-01-10 16:43:16 +01:00