Joey Lai 82fc1e5266 Merge branch 'master' into 'joey-testing' ...

# Conflicts:
#   website/views/login_head.php

2017-01-20 16:06:16 +01:00

..

API

Made chat xss prove

2017-01-20 13:30:40 +01:00

external

New Button

2017-01-18 15:27:51 +01:00

fonts

rename html folder to public

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

img

added 404 image

2017-01-19 14:55:58 +01:00

js

Merge branch 'master' into 'joey-testing'

2017-01-20 16:06:16 +01:00

styles

Merge branch 'joey-testing' into 'master'

2017-01-20 15:35:15 +01:00

.htaccess

Fixed .htaccess

2017-01-20 14:40:21 +01:00

admin.php

rename html folder to public

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

chat.php

Live chatting now shows up in the chat-history

2017-01-18 14:34:15 +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

Fixed redirect to profile page after going back 1 page

2017-01-20 16:01:08 +01:00

logout.php

Fixed login/register and added logout.php

2017-01-19 13:11:24 +01:00

profile.php

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

register.php

Fixed redirect to profile page after going back 1 page

2017-01-20 16:01:08 +01:00

search.php

rename html folder to public

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

settings.php

Alpha 0.0.1 profile picture upload shizzle!

2017-01-20 14:55:47 +01:00

template_sql.php

Made $db global

2017-01-19 11:57:54 +01:00

template.php

rename html folder to public

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