Marijn Jansen 96f421d088 Merge branch 'master' into 'marijn-postdelete' ...

# Conflicts:
#   website/public/js/masonry.js

2017-02-01 14:41:45 +01:00

..

API

Merge branch 'master' into 'marijn-postdelete'

2017-02-01 14:41:45 +01:00

bits

Fixed online status

2017-01-31 12:25:28 +01:00

error

Resize

2017-01-30 14:33:38 +01:00

external

new button!

2017-01-23 13:24:12 +01:00

fonts

rename html folder to public

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

img

Niet slecht small img

2017-02-01 14:12:13 +01:00

js

Merge branch 'master' into 'marijn-postdelete'

2017-02-01 14:41:45 +01:00

styles

Merge branch 'master' into 'marijn-postdelete'

2017-02-01 14:41:45 +01:00

.htaccess

404 page

2017-01-30 14:30:36 +01:00

admin.php

Merge branch 'master' into hendrik-testing

2017-01-31 16:17:42 +01:00

chat.php

Live chatting now shows up in the chat-history

2017-01-18 14:34:15 +01:00

emailconfirm.php

Found some extra statemensts

2017-01-29 14:08:45 +01:00

fb-callback.php

Facebook login implemented

2017-01-31 16:12:22 +01:00

fbRegister.php

Facebook ID instead of Facebook email

2017-02-01 12:25:13 +01:00

group.php

Merge branch 'master' into kevin-prototype

2017-02-01 12:27:07 +01:00

index.php

Chat messages and groups are now live.

2017-01-26 10:26:40 +01:00

login.php

Facebook ID instead of Facebook email

2017-02-01 12:25:13 +01:00

logout.php

Cleanup at logout.php

2017-01-25 12:06:13 +01:00

profile.php

Age instead of birthday

2017-01-31 16:11:20 +01:00

register.php

Facebook login implemented

2017-01-31 16:12:22 +01:00

register(stash).php

Rip website?

2017-01-31 11:50:05 +01:00

resetpassword.php

Found some extra statemensts

2017-01-29 14:08:45 +01:00

search.php

Live search

2017-01-26 14:12:04 +01:00

settings.php

Checks and resize on profile pictures :)

2017-01-24 13:54:08 +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