Marijn Jansen 08c3d73377 Merge branch 'master' into 'marijn-settings' ...

# Conflicts:
#   website/views/menu.php

2017-01-24 14:02:19 +01:00

..

API

Menu, netjes, notification

2017-01-23 16:24:48 +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

New Standard avatar

2017-01-24 14:00:55 +01:00

js

Changed admin layout and fixed for enums

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

styles

Merge branch 'hendrik-search' into 'master'

2017-01-24 10:21:17 +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

Changed style and added friendrequests

2017-01-23 11:33:27 +01:00

register.php

history back -> profile.php

2017-01-20 16:14:32 +01:00

search.php

add searching users, searching groups, remembering search options

2017-01-20 16:18:09 +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