summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-304-0/+41
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-292-2/+15
* Have uniform (wrong) indentionkondou2013-09-281-1/+1
* Base defaultavatar text on displaynamekondou2013-09-281-0/+1
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-272-0/+4
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-242-0/+19
* Merge pull request #4930 from owncloud/fix-apps-settingsThomas Müller2013-09-241-1/+3
|\
| * Fix the apps enabling/disabling in settingsBart Visscher2013-09-201-1/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-223-1/+18
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-2016-3/+87
* fixing syntax error - it it that hard to test own code?Thomas Müller2013-09-181-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-1840-0/+168
* 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