aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
Commit message (Collapse)AuthorAgeFilesLines
* Added FileList.setViewerMode to hide controlsVincent Petry2013-10-221-0/+25
| | | | | | | | | | | Some files app embed themselves under the controls (like the text editor). The new method FileList.setViewerMode() makes it possible to properly show/hide the control buttons using the correct permissions. Apps using this approach must call setViewerMode(true) when starting and setViewerMode(false) upon closing to restore the controls. This is needed for #5284
* give getSelectedFilesTrash() a unique name for the trash.js to avoid ↵Bjoern Schiessle2013-10-181-5/+5
| | | | confusions with the same function in files.js
* Fixed sharing status update for new/uploaded filesVincent Petry2013-10-173-4/+14
| | | | | | | | | | | | | | | 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 #5353 from owncloud/files-dndtodirbrokenMorris Jobke2013-10-161-14/+22
|\ \ | | | | | | Fixed drag and drop to subfolder and breadcrumb
| * | Fixed drag and drop upload to breadcrumbVincent Petry2013-10-151-26/+22
| | |
| * | Fixed drag and drop onto foldersVincent Petry2013-10-151-5/+17
| | | | | | | | | | | | Fixes #5351
* | | Disabled ajax mode for public files viewVincent Petry2013-10-142-21/+27
|/ / | | | | | | | | | | Ajax loading is not supported yet for public files view. This fix disabled the history API, ajax loading and ajax directory switch in public mode until it is implemented properly.
* | 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
* | Merge pull request #5134 from owncloud/trashbin-homeiconbrokenVincent Petry2013-10-091-3/+6
|\ \ | | | | | | Do not call changeDirectory() when no dir set on breadcrumb
| * | Do not call changeDirectory() when no dir set on breadcrumbVincent Petry2013-10-041-3/+6
| |/ | | | | | | | | | | | | | | | | | | | | Some apps like the files_trashbin app do not set a directory on its "home" breadcrumb link. This fix makes sure that the click event doesn't do anything in that case and lets the browser open the link. This fixes the "home" icon in the trashbin app which now correctly reopens the files app.
* | Merge pull request #4921 from owncloud/file_conflicts_dialog_fixesVicDeo2013-10-074-39/+6
|\ \ | | | | | | File conflicts dialog fixes
| * | remove double uri encodingJörn Friedrich Dreyer2013-10-071-4/+4
| | |
| * | canceling individual uploads is currently impossible because there is no ↵Jörn Friedrich Dreyer2013-10-072-34/+1
| | | | | | | | | | | | placeholder
| * | use !== comparisonJörn Friedrich Dreyer2013-10-071-1/+1
| |/
* / Fix breadcrumb to reinit dnd after ajax nav #5064Vincent Petry2013-10-071-6/+8
|/ | | | | | | Now correctly reinitializing the breadcrumb drop zone after ajax navigation. This also fixes dropping onto the "files" app icon.
* Merge pull request #4933 from owncloud/1376-filesappplussigninurlbugVincent Petry2013-10-041-2/+6
|\ | | | | Replace plus sign with space in files app URL #4932
| * Replace plus sign with space in files app URL #4932Vincent Petry2013-09-201-2/+6
| | | | | | | | | | | | | | | | Some apps create URLs to the files app and encode the spaces of a directory using plus signs. This fix ensures that plus signs are properly converted back to spaces when parsing the URL on the JS side.
* | Shortened notification message that was too longVincent Petry2013-10-041-1/+1
| | | | | | | | | | | | The message for invalid private key was too long and didn't fit in the notification box. This fix reduces the message to fit properly by removing the extra information.
* | Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-301-1/+5
|\ \
| * | implement previews for public uploadGeorg Ehrke2013-09-231-1/+5
| |/
* | Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-236-581/+1411
|\| | | | | | | | | Conflicts: settings/ajax/changepassword.php
| * Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-193-6/+53
| |\ | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js
| | * Merge pull request #4900 from owncloud/fixing-4488-masterJörn Friedrich Dreyer2013-09-192-1/+11
| | |\ | | | | | | | | File permissions are part of the ajax response of file upload
| | | * Merge branch 'master' into fixing-4488-masterThomas Müller2013-09-191-135/+173
| | | |\
| | | * | no file actions during uploadThomas Müller2013-09-181-1/+0
| | | | |
| | | * | remove file action elements before recreating themThomas Müller2013-09-181-0/+5
| | | | |
| | | * | store the permissions retrieved via ajax within the dom elementThomas Müller2013-09-181-0/+6
| | | | |
| | * | | Merge pull request #4263 from owncloud/search_scrolltoJörn Friedrich Dreyer2013-09-192-5/+41
| | |\ \ \ | | | |_|/ | | |/| | initial scrollto implementation
| | | * | initial scrollto implementation:Jörn Friedrich Dreyer2013-09-172-5/+41
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use places/folder icon, move link construction to JS, only show icon on hover, use 'searchresult' as css class name, add filter/unfilter methods, highlight searched files in current filelist only filter when correct FileList is present
| * | | fix race condition in lazy preview loadingJörn Friedrich Dreyer2013-09-191-12/+18
| | | |
| * | | Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core ↵Jörn Friedrich Dreyer2013-09-192-3/+3
| |\ \ \ | | | | | | | | | | | | | | | 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-192-3/+3
| | | | | |
| * | | | | 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
| |/ / /
| * | | use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ↵Jörn Friedrich Dreyer2013-09-191-4/+8
| | | | | | | | | | | | | | | | ... maybe something is wrong there
| * | | hide excessive logging with a trace flagJörn Friedrich Dreyer2013-09-182-23/+26
| | | |
| * | | 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-174-140/+351
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-101-76/+75
| |\ \ | | | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js
| * | | whitespace and indentation fixesJörn Friedrich Dreyer2013-09-081-28/+28
| | | |
| * | | remove unused hooksJörn Friedrich Dreyer2013-09-082-23/+0
| | | |
| * | | cleanup commentsJörn Friedrich Dreyer2013-09-082-203/+75
| | | |
| * | | fine ie8 compatabilityJörn Friedrich Dreyer2013-09-061-1/+5
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-11 14:35:06 +0000