Bart Visscher
|
21a88613a1
|
Merge branch 'lostpassword'
Conflicts:
core/templates/login.php
index.php
lib/util.php
|
2011-09-30 23:48:20 +02:00 |
|
Bart Visscher
|
9a5d517ec2
|
Add more checks for admin user
|
2011-09-30 23:17:30 +02:00 |
|
Bart Visscher
|
f4782a7690
|
Check if the application is actually enabled
|
2011-09-30 23:17:18 +02:00 |
|
Bart Visscher
|
f149303895
|
Add email field to personal preferences
|
2011-09-26 21:17:26 +02:00 |
|
Bart Visscher
|
17e631bc5e
|
Use OC_JSON for json responses
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
|
2011-09-25 22:19:28 +02:00 |
Robin Appelman
|
c16a9a83ba
|
actually check the correct password when changing the password
|
2011-09-25 01:06:00 +02:00 |
|
Robin Appelman
|
09092dd2d2
|
check for old password when changing passwords
|
2011-09-25 01:02:22 +02:00 |
|
Robin Appelman
|
9411d8bb08
|
fixed users not being able to change their password
|
2011-08-30 22:03:17 +02:00 |
Michael Gapczynski
|
98ca6c4a16
|
Fix changing password in personal page (not complete)
|
2011-08-27 17:40:41 -04:00 |
|
Robin Appelman
|
523b0966d2
|
add option to set user quota
|
2011-08-15 21:09:13 +02:00 |
Jan-Christoph Borchardt
|
4a5ee765cf
|
merged admin, help and settings to settings
|
2011-08-13 05:13:34 +02:00 |
|
Robin Appelman
|
d47cdc3c18
|
fix changing passwords
|
2011-08-12 14:12:01 +02:00 |
Frank Karlitschek
|
aa582ec43a
|
more work on encryption
|
2011-08-11 17:49:36 +02:00 |
|
Robin Appelman
|
f039320a0b
|
move openid settings to Personal
|
2011-08-06 10:08:26 +02:00 |
Jakob Sack
|
bafd684eb6
|
Renaming classes :-)
|
2011-07-29 21:36:03 +02:00 |
|
Robin Appelman
|
83958ebd4b
|
add oc_user::getUser to get the user id of the loggedin user
|
2011-06-22 12:50:57 +02:00 |
|
Robin Appelman
|
4c1d3155a3
|
make personal settings translatable
|
2011-06-20 14:51:33 +02:00 |
|
Robin Appelman
|
76b12c4ae0
|
add settings option for language
|
2011-06-20 14:33:31 +02:00 |
|
Jakob Sack
|
b57823baa5
|
Made the "change password" thingie in settings working
|
2011-04-18 15:07:14 +02:00 |