summaryrefslogtreecommitdiffstats
path: root/apps/files/js/file-upload.js
Commit message (Expand)AuthorAgeFilesLines
* Merge master into oc_previewGeorg Ehrke2013-08-291-14/+12
|\
| * backport of #4357 to masterThomas Müller2013-08-271-14/+12
* | Merge master into oc_previewGeorg Ehrke2013-08-261-4/+13
|\|
| * remove duplicate codeThomas Müller2013-08-221-0/+7
* | Merge branch 'master' into oc_previewGeorg Ehrke2013-08-231-8/+7
|\|
| * Merge branch 'master' into fix_jslint_kondoukondou2013-08-181-312/+312
| |\
| * | Fix a syntax error & have if-conds in an own linekondou2013-08-011-1/+3
| * | Fix some JSLint warningskondou2013-07-311-12/+11
* | | Merge master into oc_previewGeorg Ehrke2013-08-191-310/+312
|\ \ \ | | |/ | |/|
| * | communicate size of newly created file back and update UIThomas Müller2013-08-161-310/+312
| |/
* / adjust New file dialog for new stylesJan-Christoph Borchardt2013-08-151-1/+1
|/
* Added file-upload to GIT repoRoman Geber2013-06-261-0/+343