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

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

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

..

adminpanel-grouptable.php

cleaned admin.js, add admin/owner check (frontend), fix submit ajax

2017-01-30 16:32:57 +01:00

adminpanel-page.php

fixed pageselector in admin

2017-01-31 13:11:23 +01:00

adminpanel-table.php

fixsquared

2017-01-31 16:23:13 +01:00

adminpanel.php

post-merge fix

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

bdayInput.php

Facebook login implemented

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

chat-view.php

You can now only chat with friends

2017-01-26 21:50:47 +01:00

facebookRegisterModal.php

Fixed redirect link and removes test echo's

2017-02-01 12:45:26 +01:00

fbBdayInput.php

Facebook login implemented

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

footer.php

Made some pages html valid with a validator

2017-01-16 13:10:34 +01:00

forgotPasswordModal.php

Facebook ID instead of Facebook email

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

group.php

Fixed group add/leave buttons

2017-02-01 12:26:05 +01:00

head.php

Fixed online status

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

header.php

Post is now mobile friendly

2017-01-31 15:32:19 +01:00

homeLoginRegister.php

Fixed redirect link and removes test echo's

2017-02-01 12:45:26 +01:00

homepage.php

Added a header

2017-01-10 16:43:16 +01:00

loadFriends.php

Dingen door elkaar

2017-01-24 17:06:39 +01:00

login_head.php

Modal added for resetting password

2017-01-25 15:47:31 +01:00

login-view.php

Facebook ID instead of Facebook email

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

main.php

Added a menu

2017-01-11 11:10:32 +01:00

menu.php

Mobile friendly

2017-01-31 10:31:57 +01:00

messagepage.php

Redirect to index

2017-01-30 14:35:25 +01:00

notification-center.php

Frozen users cant chat with other people

2017-01-31 14:26:34 +01:00

post-view.php

Delete Posts!

2017-02-01 14:34:02 +01:00

profile.php

add infinite scroll on profile

2017-02-01 14:05:04 +01:00

register-view.php

Made different files for login and register

2017-01-27 12:27:40 +01:00

registerModal.php

Facebook login implemented

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

resetpassword.php

Email confirm and password change now use messagepage function.

2017-01-26 12:05:28 +01:00

search-view.php

add pageselector on search

2017-01-31 15:30:48 +01:00

searchPageNumber.php

add pageselector on search

2017-01-31 15:30:48 +01:00

settings-view.php

Merge branch 'marijn-settings' into 'master'

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