Marijn Jansen
|
e4ec666e03
|
Added personal Header
|
2017-01-18 16:22:27 +01:00 |
|
Marijn Jansen
|
ab8c12c9d8
|
Merge branch 'master' into 'marijn-settings'
# Conflicts:
# website/queries/settings.php
|
2017-01-18 14:52:32 +01:00 |
|
Marijn Jansen
|
e73fcd420c
|
settings succes mesages
|
2017-01-18 14:51:03 +01:00 |
|
Joey Lai
|
0808d46d9e
|
Added salting and no similar username
|
2017-01-18 14:46:32 +01:00 |
|
Joey Lai
|
afcd048260
|
Almost finished login/register page
|
2017-01-18 12:35:41 +01:00 |
|
Marijn Jansen
|
dde463df6c
|
Added password change
|
2017-01-18 10:43:54 +01:00 |
|
Marijn Jansen
|
683fec805c
|
Merge branch 'marijn-settings' into 'master'
Settings work with sql, session is hardcoded to 2 glob db
See merge request !53
|
2017-01-17 16:50:19 +01:00 |
|
Marijn Jansen
|
11f2297d5a
|
Setting loadin, settings update, db is now global
|
2017-01-17 16:47:49 +01:00 |
|
Lars van Hijfte
|
a8fcbecc2e
|
Fixed things
|
2017-01-17 15:02:54 +01:00 |
|
Lars van Hijfte
|
5812eb9b49
|
Added group_page functions for the admin page
|
2017-01-17 14:44:20 +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 |
|
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 |
|