Marijn Jansen 4da0549d85 Merge branch 'joey-testing' into 'master' ...

email matching

See merge request !17

2017-01-12 10:39:20 +01:00

..

fonts

Added font awesome

2017-01-11 13:38:40 +01:00

img

Merge branch 'kevin-prototype' into 'master'

2017-01-11 15:53:21 +01:00

js

Added extra functions to the header.

2017-01-11 13:49:54 +01:00

php

Fixed username in connection

2017-01-11 13:39:49 +01:00

styles

Fixed the data-title hover bug

2017-01-11 16:06:49 +01:00

views

Merge branch 'kevin-prototype' into 'master'

2017-01-11 15:53:21 +01:00

chat.php

Merge branch 'master' into marijn-chat

2017-01-11 14:04:53 +01:00

group.php

Added group view

2017-01-11 15:42:32 +01:00

index.php

email matching

2017-01-12 10:33:48 +01:00

profile.php

We now use inline-flex for the post grid instead of float left.

2017-01-11 15:11:42 +01:00

template.php

Added Login page

2017-01-11 15:41:27 +01:00