Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -0/+3 |
|\ | | | | | | | | | Conflicts: apps/files/js/filelist.js | ||||
| * | initial scrollto implementation: | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | move upload dialog css to separate file | Jörn Friedrich Dreyer | 2013-09-18 | 2 | -85/+119 |
| | | |||||
* | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -0/+21 |
|\| | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Fixed loading mask/spinner to stay fixed on scroll | Vincent Petry | 2013-09-13 | 1 | -1/+1 |
| | | |||||
| * | Ajax calls for "files" and "files_trashbin" apps | Vincent Petry | 2013-09-13 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | unify .original div to fix css in firefox, clear:left to fix filename ↵ | Jörn Friedrich Dreyer | 2013-09-10 | 1 | -7/+4 |
| | | | | | | | | wrapping in chrome, shrink width of columns and get rid of ie8 hack | ||||
* | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-10 | 1 | -1/+6 |
|\| | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| * | Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes | Thomas Tanghus | 2013-09-09 | 1 | -1/+6 |
| |\ | | | | | | | Fixed missing checkboxes in IE8 | ||||
| | * | Fixed missing checkboxes in IE8 | Vincent Petry | 2013-09-08 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | IE8 is not happy with the :checked CSS3 selector which causes it to ignore the whole rule. Replace it with a more compatible selector. | ||||
* | | | fine ie8 compatability | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -0/+4 |
| | | | |||||
* | | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -3/+3 |
|\| | | |||||
| * | | prefix #filestable to tbody tr | Pete McFarlane | 2013-09-06 | 1 | -3/+3 |
| |/ | |||||
* | | refactor dialog creation | Jörn Friedrich Dreyer | 2013-09-04 | 1 | -2/+5 |
| | | |||||
* | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-04 | 1 | -46/+188 |
|\| | | | | | | | | | | | | | | | | | 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 | ||||
| * | text centered horizontally and vertically in emptycontent div | Alessandro Cosentino | 2013-08-31 | 1 | -6/+0 |
| | | |||||
| * | fix issue with filetable background | Georg Ehrke | 2013-08-30 | 1 | -1/+1 |
| | | |||||
| * | Merge master into oc_preview | Georg Ehrke | 2013-08-30 | 1 | -4/+1 |
| |\ | |||||
| | * | prefix 'tbody tr' to separate app/core css errors | petemcfarlane | 2013-08-30 | 1 | -1/+1 |
| | | | | | | | | | | | | For specific details see: https://github.com/owncloud/core/pull/4536/files#r6082305 | ||||
| * | | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 1 | -2/+16 |
| |\| | |||||
| | * | Reimplement filesummary in JS | kondou | 2013-08-28 | 1 | -1/+14 |
| | | | | | | | | | | | | Fix #993 | ||||
| | * | Fix "select all" checkbox displacement when checked | Pellaeon Lin | 2013-08-26 | 1 | -1/+1 |
| | | | |||||
| * | | Merge master into oc_preview | Georg Ehrke | 2013-08-19 | 1 | -8/+18 |
| |\| | |||||
| | * | remove unneeded extra ID selectors | Jan-Christoph Borchardt | 2013-08-18 | 1 | -2/+2 |
| | | | |||||
| | * | move upload progress bar near upload button, more contextual | Jan-Christoph Borchardt | 2013-08-18 | 1 | -3/+13 |
| | | | |||||
| | * | Merge pull request #4113 from owncloud/delete-fix | Jan-Christoph Borchardt | 2013-08-15 | 1 | -4/+4 |
| | |\ | | | | | | | | | Delete icon fix | ||||
| | | * | fix delete button not showing in IE8 | Jan-Christoph Borchardt | 2013-07-22 | 1 | -4/+4 |
| | | | | |||||
| * | | | vertically center rename input box | Jan-Christoph Borchardt | 2013-08-17 | 1 | -2/+8 |
| | | | | |||||
| * | | | adjust New file dialog for new styles | Jan-Christoph Borchardt | 2013-08-15 | 1 | -2/+5 |
| | | | | |||||
| * | | | fix file summary position | Jan-Christoph Borchardt | 2013-08-14 | 1 | -2/+1 |
| | | | | |||||
| * | | | increase row height to 50px, properly position everything, checkboxes, ↵ | Jan-Christoph Borchardt | 2013-08-14 | 1 | -31/+112 |
| | | | | | | | | | | | | | | | | actions etc | ||||
| * | | | Merge branch 'master' into oc_preview | Thomas Müller | 2013-07-30 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: 3rdparty lib/template.php | ||||
| * \ \ \ | merge conflicts ... | Georg Ehrke | 2013-07-10 | 1 | -0/+8 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | some style adjustments | Georg Ehrke | 2013-07-10 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | increase size of preview to size of row | Georg Ehrke | 2013-06-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | increase Files row height to tappable 44px, more breathing space | Jan-Christoph Borchardt | 2013-06-25 | 1 | -9/+47 |
| | | | | | |||||
* | | | | | reduced complexity, added listing conflicts to dialog | Jörn Friedrich Dreyer | 2013-08-22 | 1 | -15/+38 |
| | | | | | |||||
* | | | | | progress fixes | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -3/+20 |
| | | | | | |||||
* | | | | | fix whitespace, check selected files before starting upload | Jörn Friedrich Dreyer | 2013-08-14 | 1 | -0/+41 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #3912 from owncloud/css_cleanup_kondou | Jan-Christoph Borchardt | 2013-08-08 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | General CSS cleanup | ||||
| * | | | General CSS cleanup | kondou | 2013-07-09 | 1 | -1/+1 |
| | |/ | |/| | |||||
* / | | disable "deleted files" button if trash bin is empty | Björn Schießle | 2013-07-26 | 1 | -1/+1 |
|/ / | |||||
* / | Show a summary as the last filelist entry | kondou | 2013-07-02 | 1 | -0/+8 |
|/ | | | | Fix #993 | ||||
* | better contrast for files list, darker greys for selection and hover | Jan-Christoph Borchardt | 2013-06-11 | 1 | -5/+16 |
| | |||||
* | color change to crumb elements as well. | raghunayyar | 2013-05-14 | 1 | -1/+1 |
| | |||||
* | Keeping Font Colors Consistant on the headers. | raghunayyar | 2013-05-13 | 1 | -1/+3 |
| | |||||
* | Merge pull request #2279 from owncloud/refactor_upload_js | Bart Visscher | 2013-04-06 | 1 | -1/+5 |
|\ | | | | | Refactor upload js | ||||
| * | '#upload' is actually '#uploadprogresswrapper', fix css and js to show ↵ | Jörn Friedrich Dreyer | 2013-03-28 | 1 | -1/+5 |
| | | | | | | | | cancel button correctly | ||||
* | | Using max-width instead of width for filename. | raghunayyar | 2013-03-30 | 1 | -1/+1 |
| | | |||||
* | | Adds a fixed width to the filename to prevent horizontal scroll. | raghunayyar | 2013-03-29 | 1 | -1/+1 |
|/ |