aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js/file-upload.js
Commit message (Collapse)AuthorAgeFilesLines
* Prevent closing the create dropdown when right clicking in FirefoxVincent Petry2013-10-301-1/+5
| | | | | | | Firefox sends a click event on the document when right clicking which makes pasting with right click into the field impossible. Fixes #5498
* Added fix to correctly parse non-array error messagesVincent Petry2013-10-291-2/+7
| | | | Some apps like the antivirus app return messages in a non-array format.
* use a more descriptive error message when the user tries to create '/Shared'Jörn Friedrich Dreyer2013-10-231-2/+2
|
* fixing js syntax errorThomas Müller2013-10-221-2/+2
|
* prevent user from creating or renaming sth. to an existing filenameJörn Friedrich Dreyer2013-10-221-149/+188
| | | | | | | | - show tooltip when violating naming constraints while typing - when target filename exists on server fallback to dialog to interrupt the users flow because something unexpected went wrong - fixes #5062 - also fixes some whitespace and codestyle issues in files js - uses css selector over filterAttr in touched js files
* Fixed sharing status update for new/uploaded filesVincent Petry2013-10-171-1/+1
| | | | | | | | | | | | | | | Creating new files, folders or uploading files now have their sharing icon updated accordingly. For this, the global share status list that is cached in OC.Share.statuses is reused for new files. Performance should improve as the sharing list is now only loaded once per navigation session. In OC.Share, split loadIcons into loadIcons + updateIcons. Fixes #4977
* Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfixMorris Jobke2013-10-161-1/+5
|\ | | | | Fixed conflict dialog in IE8
| * Fixed conflict dialog in IE8Vincent Petry2013-10-101-1/+5
| | | | | | | | | | - Fixed JS error that prevent the conflict dialog to open #5060 - Fixed JS error that prevented the overwrite case to run
* | Merge pull request #5207 from owncloud/fixing-4011-part2-masterThomas Müller2013-10-111-1/+1
|\ \ | | | | | | [OC6] file upload exception handling
| * | catch exceptions while uploading and pass on the error messageThomas Müller2013-10-081-1/+1
| | |
* | | File actions are now updated after create/upload fileVincent Petry2013-10-111-2/+5
| |/ |/| | | | | | | | | | | | | The file actions must explicitly be updated by calling FileActions.display() on the file element after creating or uploading a file. Fixes #4971 and #4993
* | canceling individual uploads is currently impossible because there is no ↵Jörn Friedrich Dreyer2013-10-071-20/+0
|/ | | | placeholder
* Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core ↵Jörn Friedrich Dreyer2013-09-191-1/+1
|\ | | | | | | into fix_3728_with_file_exists_dialog
| * Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core ↵Thomas Müller2013-09-191-26/+26
| |\ | | | | | | | | | | | | | | | | | | into fix_3728_with_file_exists_dialog Conflicts: apps/files/js/file-upload.js
| * | 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
|\ | | | | | | | | Conflicts: apps/files/js/file-upload.js
| * 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
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/css/files.css apps/files/js/file-upload.js apps/files/js/filelist.js apps/files/js/files.js apps/files_sharing/js/public.js core/js/jquery.ocdialog.js core/js/oc-dialogs.js
| * 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
|\| | | | | | | | | Conflicts: apps/files/js/file-upload.js
| * 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 item
| | * 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
|\| | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js
| * | Fixed public upload error that prevents uploadVincent Petry2013-09-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Public upload is broken because the file_upload_param variable expected to exist by public.js didn't. This fix sets the variable scope to the window to make it accessible outside.
* | | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/file-upload.js apps/files/js/filelist.js apps/files/js/files.js apps/files/templates/part.list.php
| * | 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
| | |\ | | | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js
| | * | 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
| |