Commit Graph

154 Commits

Author SHA1 Message Date
Vincent Petry 71cf83b314 Added fix to correctly parse non-array error messages
Some apps like the antivirus app return messages in a non-array format.
2013-10-29 16:00:34 +01:00
Vincent Petry e62ca4ea4f Append file etag to preview URLs
Fixes #5534
2013-10-28 14:14:55 +01:00
Jörn Friedrich Dreyer 8ed73e5ced use a more descriptive error message when the user tries to create '/Shared' 2013-10-23 11:08:30 +02:00
Thomas Müller ca3771f8fd fixing js syntax error 2013-10-22 22:39:28 +02:00
Jörn Friedrich Dreyer 45e6d96702 prevent user from creating or renaming sth. to an existing filename
- 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
2013-10-22 18:11:03 +02:00
Vincent Petry 467f864db4 Fixed sharing status update for new/uploaded files
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
2013-10-17 12:55:10 +02:00
Morris Jobke a132144eca Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix
Fixed conflict dialog in IE8
2013-10-16 12:52:41 -07:00
Thomas Müller dc58195c7f Merge pull request #5207 from owncloud/fixing-4011-part2-master
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00
Vincent Petry e98ea06890 File actions are now updated after create/upload file
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
2013-10-11 17:07:48 +02:00
Vincent Petry e2a4417079 Fixed conflict dialog in IE8
- Fixed JS error that prevent the conflict dialog to open #5060
- Fixed JS error that prevented the overwrite case to run
2013-10-10 15:54:00 +02:00
Thomas Müller 7c6ed6ab33 catch exceptions while uploading and pass on the error message 2013-10-08 15:03:24 +02:00
Jörn Friedrich Dreyer 0683372200 canceling individual uploads is currently impossible because there is no placeholder 2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer 1bba800e47 Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog 2013-09-19 11:33:34 +02:00
Jörn Friedrich Dreyer ae97fad632 fix double translation of error message 2013-09-19 11:32:56 +02:00
Thomas Müller eea02cee2f Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/file-upload.js
2013-09-19 11:15:20 +02:00
Thomas Müller c30c153ea5 fixing typos and l10n 2013-09-19 11:13:11 +02:00
Jörn Friedrich Dreyer 89ed0007c0 jsdoc types should go into {} 2013-09-19 11:11:22 +02:00
Jörn Friedrich Dreyer 715846626e hide excessive logging with a trace flag 2013-09-18 14:39:39 +02:00
Jörn Friedrich Dreyer 17337b22af Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/file-upload.js
2013-09-18 14:19:58 +02:00
Jörn Friedrich Dreyer 86c4c83b86 use exists 2013-09-17 19:11:18 +02:00
Jörn Friedrich Dreyer b59ce403d8 Merge branch 'master' into fix_3728_with_file_exists_dialog
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
2013-09-17 19:10:46 +02:00
Jörn Friedrich Dreyer d41e722629 refactor upload progress 2013-09-16 14:14:46 +02:00
Jörn Friedrich Dreyer 7854cf04ee refactor upload js & html to always use only js to fill form data 2013-09-13 17:07:52 +02:00
Jörn Friedrich Dreyer cec932f292 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/file-upload.js
2013-09-10 16:54:48 +02:00
Thomas Müller 956a2335ad Merge pull request #4647 from owncloud/fix_4619
Workaround for IE 9 & 10 for clicking filelist after adding new item
2013-09-10 01:22:25 -07:00
Jörn Friedrich Dreyer 577e3f22b2 remove unused hooks 2013-09-08 10:43:52 +02:00
Jörn Friedrich Dreyer 8828fafd36 cleanup comments 2013-09-08 10:41:20 +02:00
Jörn Friedrich Dreyer ce03501646 fine ie8 compatability 2013-09-06 23:44:40 +02:00
Jörn Friedrich Dreyer 673e0c01a7 fix page leaving checks 2013-09-06 22:40:10 +02:00
Jörn Friedrich Dreyer e2c0fe8296 fix upload of multiple files 2013-09-06 18:16:40 +02:00
Jörn Friedrich Dreyer 238d92b11c refactor replace and autorename resolution in upload.php 2013-09-06 17:53:58 +02:00
Jörn Friedrich Dreyer 8a7e26b268 cleanup dead code 2013-09-05 17:46:19 +02:00
Jörn Friedrich Dreyer 03ddf8da80 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/file-upload.js
2013-09-05 10:31:43 +02:00
Jörn Friedrich Dreyer bbf8acb383 separate uploading code from progress code, add progress capability detection 2013-09-05 10:19:54 +02:00
Jörn Friedrich Dreyer 4af5a8c483 Merge branch 'master' into fix_3728_with_file_exists_dialog
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
2013-09-04 14:11:40 +02:00
Vincent Petry 307b673b79 Fixed public upload error that prevents upload
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.
2013-09-01 16:14:46 +02:00
ringmaster f4ec5182bd Workaround for IE 9 & 10 for clicking filelist after adding new item 2013-08-29 12:06:07 -04:00
Georg Ehrke b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +02:00
Thomas Müller 3eed060ec9 backport of #4357 to master 2013-08-27 23:53:04 +02:00
Georg Ehrke 6f0c1e8d45 Merge master into oc_preview 2013-08-26 12:24:33 +02:00
Georg Ehrke 6ffa2a28d0 Merge branch 'master' into oc_preview 2013-08-23 23:10:37 +02:00
Jörn Friedrich Dreyer 7c9d999243 reduced complexity, added listing conflicts to dialog 2013-08-22 14:29:00 +02:00
Thomas Müller 101cfa2359 remove duplicate code 2013-08-22 00:09:43 +02:00
Jörn Friedrich Dreyer bf04daff82 architecture too complex 2013-08-21 14:58:28 +02:00
Georg Ehrke f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
kondou edd92e4c09 Merge branch 'master' into fix_jslint_kondou
Conflicts:
	apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
Jörn Friedrich Dreyer f94e603698 progress fixes 2013-08-16 11:40:55 +02:00
Thomas Müller 57f7ff2dbd communicate size of newly created file back and update UI 2013-08-16 00:31:27 +02:00
Jan-Christoph Borchardt 2fd5178a00 adjust New file dialog for new styles 2013-08-15 12:50:26 +02:00
Jörn Friedrich Dreyer 9da49264ea change filelist ui updates 2013-08-14 17:49:45 +02:00
Jörn Friedrich Dreyer e1927d5bee fix whitespace, check selected files before starting upload 2013-08-14 10:55:12 +02:00
kondou 1348330c7d Fix a syntax error & have if-conds in an own line 2013-08-01 18:44:01 +02:00
kondou aaf0fec9f5 Fix some JSLint warnings 2013-07-31 21:21:02 +02:00
Roman Geber da0caadf4e Added file-upload to GIT repo
Optimized CSS identifiers
2013-06-26 22:51:38 +02:00