Commit Graph

38 Commits

Author SHA1 Message Date
Lars van Hijfte f8c9454b85 empty SessionID sends the user to login page
If the session is empty, it now sends you to the login page with a safed url so it can revert you back to the right page after login
2017-02-02 17:43:32 +01:00
Lars van Hijfte d24ed89096 BUG FIX: mobile support fix 2017-02-02 14:04:59 +01:00
Lars van Hijfte 1dfc14e6f0 Added meta data 2017-02-02 12:44:03 +01:00
Lars van Hijfte f26097f55f Fixed online status 2017-01-31 12:25:28 +01:00
Lars van Hijfte 4dc3b4f651 Mobile friendly 2017-01-31 10:31:57 +01:00
Lars van Hijfte 89c8c35b4a Changed profile look a bit more 2017-01-29 17:24:39 +01:00
Lars van Hijfte 91fae80326 Friends and friendrequest are fully ajax. Also added friend-item 2017-01-25 16:17:46 +01:00
Lars van Hijfte 93b6835ea4 Changed style and added friendrequests 2017-01-23 11:33:27 +01:00
K. Nobel ca28724274 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
Lars van Hijfte 6c41e825fe Removed absolute path 2017-01-20 12:53:23 +01:00
Lars van Hijfte 50cec9beed Added things to the menu.
Extra item for a random friend,
If you have no groups, it has a message.
2017-01-20 12:25:18 +01:00
Lars van Hijfte a71cb8adb6 Fixed some extra things 2017-01-19 14:53:12 +01:00
Hendrik 38e5b28ff5 Merge branch 'master' into hendrik-testing 2017-01-18 16:02:02 +01:00
Lars van Hijfte 19f525d168 Live chatting now shows up in the chat-history 2017-01-18 14:34:15 +01:00
Marijn Jansen 0966b3528e Merge branch 'lars-algemeen' into 'master'
Lars algemeen

See merge request !52
2017-01-17 15:13:49 +01:00
Lars van Hijfte 6385324b13 The menu now backend supported
It loads the friends and groups of userID 2 by default (only if there is no session userID set
2017-01-17 14:16:17 +01:00
Hendrik e3e72b8ef6 fixed connect.php location in head 2017-01-17 14:02:33 +01:00
Marijn Jansen 429fba997f Merge branch 'lars-algemeen' into 'master'
Lars algemeen

See merge request !51
2017-01-17 12:49:29 +01:00
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
K. Nobel 0ef81a376a Added masonry grid to profile and group pages. 2017-01-17 12:25:09 +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