summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Clean upkondou2013-08-301-3/+3
* Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitestskondou2013-08-303-16/+14
* Use OC_Cache and finish cropper functionalitykondou2013-08-292-31/+9
* Use defaultavatarskondou2013-08-295-3/+50
* Merge branch 'master' into oc_avatarskondou2013-08-282-0/+66
|\
| * Merge pull request #4618 from owncloud/visualize-jsMorris Jobke2013-08-281-0/+65
| |\
| | * fixing typoThomas Müller2013-08-281-1/+1
| | * calculate fontsize and line-heightMorris Jobke2013-08-281-2/+7
| | * reviewers commentsMorris Jobke2013-08-281-6/+14
| | * add visualizeMorris Jobke2013-08-281-0/+52
| * | Merge pull request #4627 from owncloud/trashbin-tipsyMorris Jobke2013-08-281-0/+1
| |\ \ | | |/ | |/|
| | * change orientation for delete tooltip to left, fix #4589Jan-Christoph Borchardt2013-08-281-0/+1
* | | Use OC.Router.generate, TODO use cache, prepare for defaultavatarskondou2013-08-281-1/+1
* | | Merge branch 'master' into oc_avatarskondou2013-08-2820-191/+115
|\| |
| * | fix shadow style of username input boxJan-Christoph Borchardt2013-08-281-3/+3
| * | remove show password toggle from log in page, ref #4577 #4580Jan-Christoph Borchardt2013-08-282-4/+1
| |/
| * Merge pull request #4434 from owncloud/fix_octemplate_escapingThomas Tanghus2013-08-281-4/+5
| |\
| | * Cache Object.keys(this.vars)Thomas Tanghus2013-08-281-3/+4
| | * Fix octemplate string escaping.Thomas Tanghus2013-08-141-4/+4
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-287-4/+47
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-274-15/+22
| * | Merge pull request #4586 from owncloud/fixing-3431-masterMorris Jobke2013-08-271-140/+0
| |\ \
| | * | kill zh_CN.GB2312Thomas Müller2013-08-271-140/+0
| * | | adding translations to update eventsThomas Müller2013-08-271-12/+13
| |/ /
| * | Merge pull request #4281 from owncloud/ie8-multiselectMorris Jobke2013-08-261-0/+7
| |\ \
| | * | Better ie8 multiselectVictor Dubiniuk2013-08-011-0/+7
| * | | Merge pull request #4519 from owncloud/style-fixesMorris Jobke2013-08-261-1/+5
| |\ \ \
| | * | | fix reviewers concernsMorris Jobke2013-08-261-1/+1
| | * | | fix minor style issue in the app navigationMorris Jobke2013-08-191-1/+5
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-252-8/+12
* | | | | Continue work on cropperkondou2013-08-282-12/+62
* | | | | Translate "Permission denied" & use class-autoloaderkondou2013-08-272-8/+8
* | | | | Clean up some cruftkondou2013-08-261-1/+1
* | | | | Have a controller instead ofo avatar.php and fix some cropper-designkondou2013-08-262-0/+108
* | | | | Remove gravatar and no-avatar functionality, prepare for default avatars even...kondou2013-08-251-0/+0
* | | | | Have /avatar.php as a central avatar-pointkondou2013-08-252-17/+0
* | | | | Improve styling & enable avatar-upload at personal pagekondou2013-08-252-1/+8
* | | | | Modularize get(), async getAvatar, avatars @ usermgmtkondou2013-08-253-0/+18
* | | | | Add basic avatars and gravatarkondou2013-08-252-0/+1
|/ / / /
* | | | Merge pull request #4331 from owncloud/improve_app-managementChristopher2013-08-251-1/+11
|\ \ \ \
| * \ \ \ Merge branch 'master' into improve_app-managementkondou2013-08-2188-285/+129
| |\ \ \ \
| * | | | | Move .errormsg from settings-css to .warning in core. Reusable!kondou2013-08-181-1/+11
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-231-4/+10
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-222-8/+11
| |/ / / / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-211-4/+6
* | | | | Merge pull request #4262 from owncloud/fix_jslint_kondouChristopher2013-08-209-38/+52
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into fix_jslint_kondoukondou2013-08-18102-617/+1122
| |\ \ \ \ \
| * | | | | | Fix a syntax error & have if-conds in an own linekondou2013-08-011-7/+21
| * | | | | | Fix some JSLint warningskondou2013-07-319-38/+38
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1968-236/+63
| |_|_|/ / / |/| | | | |