Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | implement previews for public upload | Georg Ehrke | 2013-09-23 | 1 | -1/+5 |
| | |||||
* | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-19 | 3 | -6/+53 |
|\ | | | | | | | | | Conflicts: apps/files/js/filelist.js | ||||
| * | Merge pull request #4900 from owncloud/fixing-4488-master | Jörn Friedrich Dreyer | 2013-09-19 | 2 | -1/+11 |
| |\ | | | | | | | File permissions are part of the ajax response of file upload | ||||
| | * | Merge branch 'master' into fixing-4488-master | Thomas Müller | 2013-09-19 | 1 | -135/+173 |
| | |\ | |||||
| | * | | no file actions during upload | Thomas Müller | 2013-09-18 | 1 | -1/+0 |
| | | | | |||||
| | * | | remove file action elements before recreating them | Thomas Müller | 2013-09-18 | 1 | -0/+5 |
| | | | | |||||
| | * | | store the permissions retrieved via ajax within the dom element | Thomas Müller | 2013-09-18 | 1 | -0/+6 |
| | | | | |||||
| * | | | Merge pull request #4263 from owncloud/search_scrollto | Jörn Friedrich Dreyer | 2013-09-19 | 2 | -5/+41 |
| |\ \ \ | | |_|/ | |/| | | initial scrollto implementation | ||||
| | * | | initial scrollto implementation: | Jörn Friedrich Dreyer | 2013-09-17 | 2 | -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 loading | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -12/+18 |
| | | | |||||
* | | | Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core ↵ | Jörn Friedrich Dreyer | 2013-09-19 | 2 | -3/+3 |
|\ \ \ | | | | | | | | | | | | | into fix_3728_with_file_exists_dialog | ||||
| * \ \ | Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core ↵ | Thomas Müller | 2013-09-19 | 1 | -26/+26 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into fix_3728_with_file_exists_dialog Conflicts: apps/files/js/file-upload.js | ||||
| * | | | | fixing typos and l10n | Thomas Müller | 2013-09-19 | 2 | -3/+3 |
| | | | | | |||||
* | | | | | fix double translation of error message | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | jsdoc types should go into {} | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -26/+26 |
|/ / / | |||||
* | | | use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ↵ | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -4/+8 |
| | | | | | | | | | | | | ... maybe something is wrong there | ||||
* | | | hide excessive logging with a trace flag | Jörn Friedrich Dreyer | 2013-09-18 | 2 | -23/+26 |
| | | | |||||
* | | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-18 | 1 | -178/+182 |
|\| | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| * | | refactor upload progress | Jörn Friedrich Dreyer | 2013-09-16 | 1 | -135/+173 |
| |/ | |||||
* | | use exists | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-17 | 4 | -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 pull request #4838 from owncloud/refactor_upload_js | Thomas Müller | 2013-09-16 | 1 | -9/+11 |
| |\ | | | | | | | refactor upload js & html to always use only js to fill form data | ||||
| | * | refactor upload js & html to always use only js to fill form data | Jörn Friedrich Dreyer | 2013-09-13 | 1 | -9/+11 |
| | | | |||||
| * | | Use hash part of URL for IE8 in files app | Vincent Petry | 2013-09-13 | 1 | -7/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this fix, the URL wasn't updated in IE8 when navigating into folders. This fix makes use of the hash part of URLs to make this work in IE8, since IE8 doesn't support the history API nor changing the URL without redirecting. From now, both the regular query URL "?dir=somedir" and "#?dir=somedir" will work in both IE8 and non-IE8 browsers. In IE8, query based URLs are automatically converted to hash URLs upon page load. The conversion is done on the server side by redirecting the user to the updated URL. When loading a page directly using a hash URL in the form "#?dir=somedir" in IE8, the server doesn't get the hash, so it will not return any results in that case and rely on ajax to load the first page. | ||||
| * | | Fixed JS error in trashbin app | Vincent Petry | 2013-09-13 | 1 | -0/+4 |
| | | | |||||
| * | | Changed breadcrumb event handling to not use delegate | Vincent Petry | 2013-09-13 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | Using delegate might break apps that embed themselves in the files container. When an app embeds itself and the user clicks a breadcrumb, it will simply reload the whole browser page. | ||||
| * | | Fixed ajax support to also update the current dir permissions | Vincent Petry | 2013-09-13 | 1 | -2/+14 |
| | | | |||||
| * | | update file summary on ajax file list load | Thomas Müller | 2013-09-13 | 1 | -0/+1 |
| | | | |||||
| * | | fixing breadcrumbs on ajax loading of files | Thomas Müller | 2013-09-13 | 2 | -64/+75 |
| | | | |||||
| * | | calling replaceSVG() to display breadcrumb images correctly on IE8 | Thomas Müller | 2013-09-13 | 1 | -0/+6 |
| | | | |||||
| * | | fixing no-repeat for IE8 | Thomas Müller | 2013-09-13 | 1 | -0/+1 |
| | | | |||||
| * | | Ajax calls for "files" and "files_trashbin" apps | Vincent Petry | 2013-09-13 | 3 | -31/+159 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | Frontend: - The files app list now uses ajax calls to refresh the list. - Added support the browser back button (history API). - Added mask + spinner while loading file list Backend: - Added utility function in core JS for parsing query strings. - Moved file list + breadcrumb template data code to helper functions - Fixed some file paths in trashbin app to be similar to the files app | ||||
* | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-10 | 1 | -76/+75 |
|\| | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| * | Merge pull request #4647 from owncloud/fix_4619 | Thomas Müller | 2013-09-10 | 1 | -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 item | ringmaster | 2013-08-29 | 1 | -0/+3 |
| | | | |||||
* | | | whitespace and indentation fixes | Jörn Friedrich Dreyer | 2013-09-08 | 1 | -28/+28 |
| | | | |||||
* | | | remove unused hooks | Jörn Friedrich Dreyer | 2013-09-08 | 2 | -23/+0 |
| | | | |||||
* | | | cleanup comments | Jörn Friedrich Dreyer | 2013-09-08 | 2 | -203/+75 |
| | | | |||||
* | | | fine ie8 compatability | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -1/+5 |
| | | | |||||
* | | | fix page leaving checks | Jörn Friedrich Dreyer | 2013-09-06 | 2 | -105/+46 |
| | | | |||||
* | | | fix upload to folder | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -16/+3 |
| | | | |||||
* | | | fix upload of multiple files | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -2/+2 |
| | | | |||||
* | | | refactor replace and autorename resolution in upload.php | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -2/+2 |
| | | | |||||
* | | | cleanup dead code | Jörn Friedrich Dreyer | 2013-09-05 | 1 | -30/+38 |
| | | | |||||
* | | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-05 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| * | | Merge pull request #4683 from owncloud/publicuploadjserror | Thomas Müller | 2013-09-04 | 1 | -0/+1 |
| |\ \ | | | | | | | | | Fixed public upload error that prevents upload | ||||
| | * | | Fixed public upload error that prevents upload | Vincent Petry | 2013-09-01 | 1 | -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 detection | Jörn Friedrich Dreyer | 2013-09-05 | 3 | -114/+131 |
| | | | | |||||
* | | | | refactor dialog creation | Jörn Friedrich Dreyer | 2013-09-04 | 1 | -5/+7 |
| | | | | |||||
* | | | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-04 | 5 | -350/+303 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |