summaryrefslogtreecommitdiffstats
path: root/settings/js
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4506 from owncloud/oc_avatarsBernhard Posselt2013-09-141-0/+112
|\
| * Merge branch 'master' into oc_avatarskondou2013-09-121-1/+1
| |\
| * | Have the "notsquare" error as data, not as messagekondou2013-09-061-1/+1
| * | Clean up avatars and preliminary use JSON->rawlist.phpkondou2013-09-051-1/+1
| * | Fix an IE8 bug with the avatarcropper.kondou2013-09-051-9/+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
| * | 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-031-18/+20
| * | Merge branch 'master' into oc_avatarskondou2013-09-031-4/+4
| |\ \
| * | | Fix some of @jancborchardt's complaints in oc_avatarskondou2013-09-021-1/+1
| * | | Fix @tanghus's complains in avatars and clean up cropper after closing with "x"kondou2013-09-011-2/+6
| * | | Sanitize displayname, respect data @ $element, fix routename, clean after cro...kondou2013-08-311-1/+2
| * | | Merge branch 'master' into oc_avatarskondou2013-08-311-1/+9
| |\ \ \
| * | | | 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-291-2/+2
| * | | | Use OC.Router.generate, TODO use cache, prepare for defaultavatarskondou2013-08-281-4/+4
| * | | | Continue work on cropperkondou2013-08-281-2/+3
| * | | | Have a controller instead ofo avatar.php and fix some cropper-designkondou2013-08-261-9/+16
| * | | | Use Jcrop, have inline errormsg, work on cropping, clean up, WIPkondou2013-08-251-13/+49
| * | | | Remove gravatar and no-avatar functionality, prepare for default avatars even...kondou2013-08-251-6/+0
| * | | | Integrate newavatar.php into avatar.php by using GET, POST & DELETEkondou2013-08-251-3/+8
| * | | | Several improvementskondou2013-08-251-1/+1
| * | | | Have a fancy uploadavatar buttonkondou2013-08-251-0/+4
| * | | | Refactor newavatar.php and show (for now) an alert on problems when setting n...kondou2013-08-251-4/+13
| * | | | Have /avatar.php as a central avatar-pointkondou2013-08-251-3/+1
| * | | | Improve styling & enable avatar-upload at personal pagekondou2013-08-251-0/+8
| * | | | Modularize get(), async getAvatar, avatars @ usermgmtkondou2013-08-251-0/+24
| * | | | Add basic avatars and gravatarkondou2013-08-251-0/+6
* | | | | Allow numeric group namesringmaster2013-09-131-3/+3
| |_|_|/ |/| | |
* | | | Fix language selection; Fix #4756kondou2013-09-071-1/+1
| |_|/ |/| |
* | | fix issues caused by introduction of sticky Apps management footerJan-Christoph Borchardt2013-08-301-4/+4
| |/ |/|
* | no duplicate declaration of appLicense + camelCaseThomas Müller2013-08-281-5/+4
* | Work around #4630 to fix license showingkondou2013-08-281-1/+10
|/
* Merge branch 'master' into improve_app-managementkondou2013-08-215-19/+82
|\
| * Merge pull request #4262 from owncloud/fix_jslint_kondouChristopher2013-08-204-7/+10
| |\
| | * Merge branch 'master' into fix_jslint_kondoukondou2013-08-181-1/+7
| | |\
| | * | 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-201-11/+17
| |\ \ \
| | * | | Break long lines into smaller ones.Owen Winkler2013-08-181-3/+10
| | * | | Use JSON to send/receive group data.Owen Winkler2013-08-151-11/+10
| | | |/ | | |/|
| * | | Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-181-0/+54
| |\ \ \
| | * | | Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-171-1/+7
| | |\| |
| | * | | working decrypt files methodBjoern Schiessle2013-07-291-8/+49
| | * | | add ajax call to decrypt all filesBjörn Schießle2013-07-291-0/+13
| | | |/ | | |/|
| * | | Add _many_ newlines at the end of fileskondou2013-08-182-2/+2
| | |/ | |/|