Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Update #free_space on getstoragestats AJAX call | Pellaeon Lin | 2013-12-11 | 1 | -0/+1 | |
|/ | ||||||
* | Selection summary is now displayed properly | Vincent Petry | 2013-11-11 | 1 | -1/+1 | |
| | | | | Fixes #5775 | |||||
* | Fixed storage stats to be based on current directory | Vincent Petry | 2013-11-06 | 1 | -7/+19 | |
| | | | | | | | | Previously, the storage statistics were always for the root dir. This means that the upload button would always show the limit for the root dir, even when uploading to a shared dir or external storage. This fix adds a "dir" argument to getstoragestats.php. | |||||
* | Update quota value in client after scan and upload | Vincent Petry | 2013-11-06 | 1 | -12/+31 | |
| | | | | | | After uploading, the quota value wasn't refreshed. This fix refreshes the quota value after files have been scanned or uploaded. | |||||
* | calling getstoragestats.php only if a user is logged in because this call ↵ | Thomas Müller | 2013-11-05 | 1 | -17/+19 | |
| | | | | requires a user to be logged in | |||||
* | Merge pull request #5582 from owncloud/files-previewcaching | Thomas Müller | 2013-11-05 | 1 | -29/+56 | |
|\ | | | | | Append file etag to preview URLs | |||||
| * | Fixed preview URL + size while dragging an existing file | Vincent Petry | 2013-10-28 | 1 | -2/+3 | |
| | | ||||||
| * | Append file etag to preview URLs | Vincent Petry | 2013-10-28 | 1 | -27/+53 | |
| | | | | | | | | Fixes #5534 | |||||
* | | prefer closest over parent | Jörn Friedrich Dreyer | 2013-10-31 | 1 | -1/+1 | |
| | | | | | | closest will search up the tree | |||||
* | | use data-file to retrieve filename | Jörn Friedrich Dreyer | 2013-10-31 | 1 | -1/+1 | |
|/ | | | | forward port of https://github.com/owncloud/core/pull/5647#discussion-diff-7341163 trust me, I know what I'm doing | |||||
* | Merge branch 'master' into ↵ | Jörn Friedrich Dreyer | 2013-10-23 | 1 | -2/+10 | |
|\ | | | | | | | | | | | | | prevent_user_from_creating_or_renaming_to_an_existing_filename Conflicts: apps/files/js/filelist.js | |||||
| * | Fixed ugly white space while loading file thumbnail | Vincent Petry | 2013-10-22 | 1 | -2/+10 | |
| | | | | | | | | | | | | | | Preview images are now pre-loaded before being set on the file element. This fixes #5135 and prevents a white space to be displayed while the thumbnails is being loaded. | |||||
* | | prevent user from creating or renaming sth. to an existing filename | Jörn Friedrich Dreyer | 2013-10-22 | 1 | -99/+99 | |
|/ | | | | | | | | - 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 | |||||
* | give getSelectedFilesTrash() a unique name for the trash.js to avoid ↵ | Bjoern Schiessle | 2013-10-18 | 1 | -5/+5 | |
| | | | | confusions with the same function in files.js | |||||
* | Disabled ajax mode for public files view | Vincent Petry | 2013-10-14 | 1 | -1/+3 | |
| | | | | | | 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 #5134 from owncloud/trashbin-homeiconbroken | Vincent Petry | 2013-10-09 | 1 | -3/+6 | |
|\ | | | | | Do not call changeDirectory() when no dir set on breadcrumb | |||||
| * | Do not call changeDirectory() when no dir set on breadcrumb | Vincent Petry | 2013-10-04 | 1 | -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_fixes | VicDeo | 2013-10-07 | 1 | -4/+4 | |
|\ \ | | | | | | | File conflicts dialog fixes | |||||
| * | | remove double uri encoding | Jörn Friedrich Dreyer | 2013-10-07 | 1 | -4/+4 | |
| |/ | ||||||
* / | Fix breadcrumb to reinit dnd after ajax nav #5064 | Vincent Petry | 2013-10-07 | 1 | -6/+8 | |
|/ | | | | | | | Now correctly reinitializing the breadcrumb drop zone after ajax navigation. This also fixes dropping onto the "files" app icon. | |||||
* | Shortened notification message that was too long | Vincent Petry | 2013-10-04 | 1 | -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_4617 | Bjoern Schiessle | 2013-09-30 | 1 | -1/+5 | |
|\ | ||||||
| * | implement previews for public upload | Georg Ehrke | 2013-09-23 | 1 | -1/+5 | |
| | | ||||||
* | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-23 | 1 | -39/+28 | |
|\| | | | | | | | | | Conflicts: settings/ajax/changepassword.php | |||||
| * | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -0/+5 | |
| |\ | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js | |||||
| | * | initial scrollto implementation: | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | ||||||
| * | | fixing typos and l10n | Thomas Müller | 2013-09-19 | 1 | -2/+2 | |
| | | | ||||||
| * | | 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 | |||||
| * | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -93/+115 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | separate uploading code from progress code, add progress capability detection | Jörn Friedrich Dreyer | 2013-09-05 | 1 | -16/+16 | |
| | | | ||||||
| * | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-04 | 1 | -203/+37 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | architecture too complex | Jörn Friedrich Dreyer | 2013-08-21 | 1 | -7/+0 | |
| | | | | ||||||
| * | | | progress fixes | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -27/+2 | |
| | | | | ||||||
* | | | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-16 | 1 | -81/+103 | |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: apps/files/index.php | |||||
| * | | | 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. | |||||
| * | | | fixing breadcrumbs on ajax loading of files | Thomas Müller | 2013-09-13 | 1 | -62/+71 | |
| | | | | ||||||
| * | | | Ajax calls for "files" and "files_trashbin" apps | Vincent Petry | 2013-09-13 | 1 | -19/+29 | |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
* / | | no longer enforce log out, but provide useful errors/warnings instead | Bjoern Schiessle | 2013-09-06 | 1 | -0/+9 | |
|/ / | ||||||
* | | Merge master into oc_preview | Georg Ehrke | 2013-08-26 | 1 | -200/+0 | |
|\ \ | ||||||
| * | | remove duplicate code | Thomas Müller | 2013-08-22 | 1 | -198/+0 | |
| | | | ||||||
* | | | fix preview issue when uploading a file with parentheses | Georg Ehrke | 2013-08-26 | 1 | -1/+3 | |
| | | | ||||||
* | | | move path generation for previews to dedicated function | Georg Ehrke | 2013-08-23 | 1 | -2/+7 | |
| | | | ||||||
* | | | Merge master into oc_preview | Georg Ehrke | 2013-08-19 | 1 | -0/+16 | |
|\| | | ||||||
| * | | Merge pull request #4239 from owncloud/decrypt_files_again | Björn Schießle | 2013-08-18 | 1 | -0/+14 | |
| |\ \ | | | | | | | | | Enable user to decrypt files again after encryption app was disabled | |||||
| | * \ | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 1 | -11/+11 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php | |||||
| | * | | | remove whitespaces and some leftover code from testing | Bjoern Schiessle | 2013-08-15 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | check if some encrypted files are left after the app was disabled and warn ↵ | Bjoern Schiessle | 2013-08-12 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | | | the user | |||||
| * | | | | communicate size of newly created file back and update UI | Thomas Müller | 2013-08-16 | 1 | -0/+2 | |
| | |/ / | |/| | |