Lars van Hijfte
|
10d3e177ae
|
Begin with the connection between php and mysql.
It has a template that loads all the friends of userID 666.
It uses a connect.php and a friendship.php
|
2017-01-17 12:48:01 +01:00 |
|
Marijn Jansen
|
9db7c6776c
|
Moved <head>-tag to the page files, not all css files will be loaded for each page.
|
2017-01-13 12:03:46 +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
|
fd171d01f3
|
Merge branch 'master' into lars-search
|
2017-01-12 14:37:01 +01:00 |
|
Marijn Jansen
|
10558a6877
|
Merge branch 'master' into marijn-settings
|
2017-01-12 14:21:28 +01:00 |
|
Lars van Hijfte
|
2434ffc675
|
Added filter on the search page.
|
2017-01-12 12:20:47 +01:00 |
|
Hendrik
|
72d3a5ad8a
|
added adminpanel main layout/concept
|
2017-01-12 11:16:57 +01:00 |
|
Marijn Jansen
|
319a406d6f
|
Added settings page.
|
2017-01-12 11:00:44 +01:00 |
|
Kevin Nobel
|
69d1ee9cd8
|
Merge branch 'master' into kevin-prototype
|
2017-01-11 14:04:51 +01:00 |
|
Lars van Hijfte
|
8761c89f75
|
Added a footer.
This also sets the default height of the page to 100% so that the footer is always on the bottom
|
2017-01-11 13:07:52 +01:00 |
|
Kevin Nobel
|
019a89c865
|
Merge branch 'master' into kevin-prototype
|
2017-01-11 11:30:04 +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
|
81e4d1e874
|
Fixed for merge
|
2017-01-10 17:12:16 +01:00 |
|
Kevin Nobel
|
40ce3d57b3
|
Added profile view. (WIP)
|
2017-01-10 17:09:11 +01:00 |
|
Marijn Jansen
|
cf240ca656
|
Almost a chatpage!
|
2017-01-10 17:08:40 +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 |
|
Lars van Hijfte
|
aebb9faefa
|
Fixed the css import
|
2017-01-10 15:15:37 +01:00 |
|
Lars van Hijfte
|
4da39d5bab
|
This inserts the map structure we will use for the project.
|
2017-01-10 14:35:56 +01:00 |
|