Commit Graph

14 Commits

Author SHA1 Message Date
Thomas Müller e43e8b0db8 Merge branch 'master' into rename-lostpassword-controller
Conflicts:
	core/lostpassword/controller.php
2013-09-04 20:46:32 +02:00
Bart Visscher 5539b9e843 Use the namespaced variation of the classname. 2013-09-02 21:25:32 +02:00
kondou 9c5416fe4a Clean up \OC\Util
- Use camelCase

 - Add some phpdoc

 - Fix some indents

 - Use some more spacing
2013-08-15 15:57:32 +02:00
Myles McNamara f5d23c469d use getName instead of getTitle 2013-08-08 16:21:47 -04:00
Myles McNamara 74a264e82e fix syntax error
accidentally had ; included, and changed concatenating
2013-08-03 18:47:27 -04:00
Myles McNamara 8edc0f210b use theme name and title for password reset
password reset email uses owncloud, updated to use theme settings
2013-08-03 00:00:32 -04:00
Björn Schießle 7f6a9e8fef fix lost password page, don't show checkbox is encryption is not enabled 2013-06-19 11:48:09 +02:00
Björn Schießle 58fd76607b print a warning if a user wants to reset his password and encryption is enabled 2013-06-05 18:38:39 +02:00
Brice Maron 4f4e81d3d2 Add message when trouble sending email ref #1799 2013-02-20 21:14:55 +01:00
Michael Gapczynski 394cebc90f Remove echo from lost password page 2013-01-04 11:12:28 -05:00
Randolph Carter d2828bab07 fixes default email sender address 2012-12-19 01:09:14 +01:00
Bart Visscher fecfeac55d Fix introduced style errors 2012-10-27 17:45:15 +02:00
Bart Visscher a8d0f84829 Resetting the password should also invalidate the token login cookies 2012-10-17 17:26:12 +02:00
Bart Visscher 0a614429af Change the lostpassword flow to a controller 2012-10-17 17:24:49 +02:00