summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into oc_avatarskondou2013-08-2861-287/+168
|\
| * Merge pull request #4563 from owncloud/use_personal-passwordJan-Christoph Borchardt2013-08-282-2/+2
| |\
| | * Use personal-password for the password name in personal.phpkondou2013-08-242-2/+2
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-284-0/+19
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-2711-5/+34
| * | Merge pull request #4586 from owncloud/fixing-3431-masterMorris Jobke2013-08-271-118/+0
| |\ \
| | * | kill zh_CN.GB2312Thomas Müller2013-08-271-118/+0
| * | | storage information is path specificThomas Müller2013-08-271-1/+1
| |/ /
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-2558-163/+114
* | | 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
* | | Modularize get(), async getAvatar, avatars @ usermgmtkondou2013-08-257-2/+71
* | | Add basic avatars and gravatarkondou2013-08-257-0/+72
|/ /
* | Merge pull request #4331 from owncloud/improve_app-managementChristopher2013-08-254-22/+54
|\ \ | |/ |/|
| * Merge branch 'master' into improve_app-managementkondou2013-08-2170-34/+282
| |\
| * | Move .errormsg from settings-css to .warning in core. Reusable!kondou2013-08-183-14/+6
| * | Use appitem instead of always recreating a jquery objectkondou2013-08-181-15/+13
| * | Don't use an alert for displaying app-mgmt-errorskondou2013-08-183-10/+44
| * | Merge branch 'master' into improve_app-managementkondou2013-08-1810-36/+47
| |\ \
| * \ \ Merge branch 'master' into improve_app-managementkondou2013-08-0975-76/+348
| |\ \ \
| * | | | Log exception at the catching codekondou2013-08-091-0/+1
| * | | | Improve app-managementkondou2013-08-062-11/+18
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-233-0/+18
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-225-1/+16
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-2125-0/+65
* | | | Merge pull request #4262 from owncloud/fix_jslint_kondouChristopher2013-08-204-7/+10
|\ \ \ \
| * \ \ \ Merge branch 'master' into fix_jslint_kondoukondou2013-08-1881-129/+441
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Fix a syntax error & have if-conds in an own linekondou2013-08-011-1/+3
| * | | | Fix some JSLint warningskondou2013-07-314-7/+8
* | | | | Merge pull request #4447 from owncloud/fix_4351_masterMorris Jobke2013-08-204-22/+29
|\ \ \ \ \
| * | | | | Break long lines into smaller ones.Owen Winkler2013-08-181-3/+10
| * | | | | Use JSON to send/receive group data.Owen Winkler2013-08-154-22/+22
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1935-0/+62
* | | | | | Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-185-0/+111
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-1781-122/+464
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | check if some encrypted files are left after the app was disabled and warn th...Bjoern Schiessle2013-08-121-7/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 00:31:34 +0000