aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js/file-upload.js
Commit message (Expand)AuthorAgeFilesLines
* separate uploading code from progress code, add progress capability detectionJörn Friedrich Dreyer2013-09-051-88/+105
* Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-041-122/+130
|\
| * 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
| |/
* | reduced complexity, added listing conflicts to dialogJörn Friedrich Dreyer2013-08-221-64/+162
* | architecture too complexJörn Friedrich Dreyer2013-08-211-26/+83
* | progress fixesJörn Friedrich Dreyer2013-08-161-82/+181
* | change filelist ui updatesJörn Friedrich Dreyer2013-08-141-0/+27
* | fix whitespace, check selected files before starting uploadJörn Friedrich Dreyer2013-08-141-304/+406
|/
* Added file-upload to GIT repoRoman Geber2013-06-261-0/+343