aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js/file-upload.js
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core i...Jörn Friedrich Dreyer2013-09-191-1/+1
|\
| * Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core i...Thomas Müller2013-09-191-26/+26
| |\
| * | fixing typos and l10nThomas Müller2013-09-191-1/+1
* | | fix double translation of error messageJörn Friedrich Dreyer2013-09-191-1/+1
| |/ |/|
* | jsdoc types should go into {}Jörn Friedrich Dreyer2013-09-191-26/+26
|/
* hide excessive logging with a trace flagJörn Friedrich Dreyer2013-09-181-18/+21
* Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-181-178/+182
|\
| * refactor upload progressJörn Friedrich Dreyer2013-09-161-135/+173
* | use existsJörn Friedrich Dreyer2013-09-171-1/+1
* | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-171-4/+9
|\|
| * refactor upload js & html to always use only js to fill form dataJörn Friedrich Dreyer2013-09-131-9/+11
* | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-101-76/+75
|\|
| * Merge pull request #4647 from owncloud/fix_4619Thomas Müller2013-09-101-0/+3
| |\
| | * Workaround for IE 9 & 10 for clicking filelist after adding new itemringmaster2013-08-291-0/+3
* | | remove unused hooksJörn Friedrich Dreyer2013-09-081-3/+0
* | | cleanup commentsJörn Friedrich Dreyer2013-09-081-138/+67
* | | fine ie8 compatabilityJörn Friedrich Dreyer2013-09-061-1/+5
* | | fix page leaving checksJörn Friedrich Dreyer2013-09-061-97/+33
* | | fix upload of multiple filesJörn Friedrich Dreyer2013-09-061-2/+2
* | | refactor replace and autorename resolution in upload.phpJörn Friedrich Dreyer2013-09-061-2/+2
* | | cleanup dead codeJörn Friedrich Dreyer2013-09-051-30/+38
* | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-051-1/+1
|\| |
| * | Fixed public upload error that prevents uploadVincent Petry2013-09-011-0/+1
* | | 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