Lukas Reschke 7a9d60d87e Merge remote-tracking branch 'upstream/master' into master-upstream-sync

2016-06-26 12:55:05 +02:00

..

AvatarController.php

Add fancy layout

2016-06-09 17:55:26 +02:00

LoginController.php

Do not leak the login name - fixes #25047

2016-06-09 16:44:31 +02:00

LostController.php

Update license headers

2016-05-26 19:57:24 +02:00

OccController.php

occ web executor (#24957)

2016-06-22 13:12:36 +02:00

SetupController.php

Update license headers

2016-05-26 19:57:24 +02:00

TokenController.php

do not generate device token if 2FA is enable for user

2016-06-09 14:00:00 +02:00

TwoFactorChallengeController.php

Allow to cancel 2FA after login

2016-06-09 14:00:02 +02:00

UserController.php

Update license headers

2016-05-26 19:57:24 +02:00