aboutsummaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4745 from owncloud/split_personal-user_passwordchangeBart Visscher2013-09-185-72/+122
|\
| * Translate errormsgs in settings/changepassword/controllerkondou2013-09-181-5/+14
| * Improve changepassword route namingkondou2013-09-133-4/+4
| * Move ajax/changepassword to changepassword/controller to use autoloadingkondou2013-09-132-3/+0
| * Merge branch 'master' into split_personal-user_passwordchangekondou2013-09-1120-23/+239
| |\
| * | Use a controller instead of two files for changepassword.phpkondou2013-09-113-82/+94
| * | Remove $recoveryPassword from changepersonalpassword & fix indentkondou2013-09-062-9/+12
| * | Split personal and user-mgmt password change logickondou2013-09-065-23/+52
* | | Merge pull request #4506 from owncloud/oc_avatarsBernhard Posselt2013-09-146-0/+150
|\ \ \
| * \ \ Merge branch 'master' into oc_avatarskondou2013-09-127-10/+67
| |\ \ \ | | | |/ | | |/|
| * | | Pass view in \OC_Avatar to constructor and use $_ for enable_avatarskondou2013-09-094-3/+5
| * | | Have the "notsquare" error as data, not as messagekondou2013-09-061-1/+1
| * | | Clean up avatars and preliminary use JSON->rawlist.phpkondou2013-09-052-2/+4
| * | | Fix an IE8 bug with the avatarcropper.kondou2013-09-052-10/+12
| * | | Have login-checks and CSRF checkskondou2013-09-051-1/+1
| * | | Remove backgroundcolor on updating avatar, and add a missing parameterkondou2013-09-041-3/+8
| * | | Merge branch 'master' into oc_avatarskondou2013-09-042-2/+18
| |\ \ \
| * | | | Clean up oc_avatarskondou2013-09-041-6/+8
| * | | | Don't update avatar on displayNameChange anymorekondou2013-09-041-1/+0
| * | | | Fix unwanted caching in IE8kondou2013-09-031-4/+9
| * | | | Partly fix cropper in IE8 and don't use a dialog for itkondou2013-09-032-25/+34
| * | | | Merge branch 'master' into oc_avatarskondou2013-09-035-6/+16
| |\ \ \ \
| * | | | | Fix some of @jancborchardt's complaints in oc_avatarskondou2013-09-022-5/+5
| * | | | | Fix @tanghus's complains in avatars and clean up cropper after closing with "x"kondou2013-09-011-2/+6
| * | | | | Provide 'enable_avatars' in config.php, to disable avatarskondou2013-09-013-2/+10
| * | | | | Sanitize displayname, respect data @ $element, fix routename, clean after cro...kondou2013-08-312-4/+2
| * | | | | Merge branch 'master' into oc_avatarskondou2013-08-317-6/+147
| |\ \ \ \ \
| * | | | | | Clean upkondou2013-08-301-1/+0
| * | | | | | Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitestskondou2013-08-301-16/+18
| * | | | | | Use OC_Cache and finish cropper functionalitykondou2013-08-291-7/+4
| * | | | | | Use defaultavatarskondou2013-08-294-6/+4
| * | | | | | Include placeholder.jskondou2013-08-281-2/+2
| * | | | | | Use OC.Router.generate, TODO use cache, prepare for defaultavatarskondou2013-08-282-4/+6
| * | | | | | Merge branch 'master' into oc_avatarskondou2013-08-2861-287/+168
| |\ \ \ \ \ \
| * | | | | | | Continue work on cropperkondou2013-08-281-2/+3
| * | | | | | | Clean up some cruftkondou2013-08-262-4/+0
| * | | | | | | Have a controller instead ofo avatar.php and fix some cropper-designkondou2013-08-263-12/+19
| * | | | | | | Use Jcrop, have inline errormsg, work on cropping, clean up, WIPkondou2013-08-254-13/+54
| * | | | | | | Remove gravatar and no-avatar functionality, prepare for default avatars even...kondou2013-08-258-71/+8
| * | | | | | | Integrate newavatar.php into avatar.php by using GET, POST & DELETEkondou2013-08-254-39/+9
| * | | | | | | Deny access for non-users and add a (not-working) override buttonkondou2013-08-251-0/+1
| * | | | | | | Several improvementskondou2013-08-254-41/+33
| * | | | | | | Have a fancy uploadavatar buttonkondou2013-08-252-1/+6
| * | | | | | | Refactor newavatar.php and show (for now) an alert on problems when setting n...kondou2013-08-252-22/+33
| * | | | | | | Use avatar.php in user-managementkondou2013-08-251-1/+1
| * | | | | | | Show avatar on personal.php always (except if avatars are disabled)kondou2013-08-251-5/+11
| * | | | | | | Have /avatar.php as a central avatar-pointkondou2013-08-252-5/+3
| * | | | | | | Improve styling & enable avatar-upload at personal pagekondou2013-08-256-18/+34
| * | | | | | | Load avatar from path, if one's providedkondou2013-08-251-7/+3
| * | | | | | | Add unittests & check filetype in setLocalAvatar()kondou2013-08-251-6/+4