Marijn Jansen ab8c12c9d8 Merge branch 'master' into 'marijn-settings' ...

# Conflicts:
#   website/queries/settings.php

2017-01-18 14:52:32 +01:00

..

external

New button

2017-01-17 12:25:04 +01:00

fonts

rename html folder to public

2017-01-13 14:44:45 +01:00

img

Added default profile picture

2017-01-17 14:24:08 +01:00

js

Merge branch 'lars-algemeen' into 'master'

2017-01-17 15:13:49 +01:00

styles

Merge branch 'master' into 'marijn-settings'

2017-01-18 14:52:32 +01:00

admin.php

rename html folder to public

2017-01-13 14:44:45 +01:00

chat.php

rename html folder to public

2017-01-13 14:44:45 +01:00

group.php

rename html folder to public

2017-01-13 14:44:45 +01:00

index.php

Made an index

2017-01-13 16:09:56 +01:00

login.php

Added salting and no similar username

2017-01-18 14:46:32 +01:00

profile.php

rename html folder to public

2017-01-13 14:44:45 +01:00

register.php

Added salting and no similar username

2017-01-18 14:46:32 +01:00

search.php

rename html folder to public

2017-01-13 14:44:45 +01:00

settings.php

settings succes mesages

2017-01-18 14:51:03 +01:00

template_sql.php

The menu now backend supported

2017-01-17 14:16:17 +01:00

template.php

rename html folder to public

2017-01-13 14:44:45 +01:00