Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix not displaying "Upload something!" message | kondou | 2013-09-23 | 1 | -1/+1 |
| | | | | Fix #4940 | ||||
* | implement previews for public upload | Georg Ehrke | 2013-09-23 | 1 | -1/+5 |
| | |||||
* | fix previews in shared folders | Georg Ehrke | 2013-09-23 | 1 | -2/+2 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-22 | 7 | -3/+37 |
| | |||||
* | Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading | Thomas Müller | 2013-09-21 | 8 | -17/+16 |
|\ | | | | | namespaces use upcasefirst parts | ||||
| * | remove unneccessary lib in namespace | Jörn Friedrich Dreyer | 2013-09-20 | 8 | -17/+16 |
| | | |||||
| * | namespaces use upcasefirst parts | Jörn Friedrich Dreyer | 2013-09-20 | 7 | -16/+16 |
| | | | | | | | | | | when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic! | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-20 | 60 | -154/+5 |
| | | |||||
* | | Merge pull request #4684 from owncloud/improved-console | Bart Visscher | 2013-09-19 | 3 | -31/+82 |
|\ \ | |/ |/| | Use more object oriented way for console commands | ||||
| * | Add copyright, remove starting blank line | Bart Visscher | 2013-09-19 | 1 | -0/+7 |
| | | |||||
| * | Use appinfo/register_command.php to add commands to the console command | Bart Visscher | 2013-09-13 | 1 | -0/+9 |
| | | |||||
| * | Change Files Scan command to use OC\User\Manager | Bart Visscher | 2013-09-02 | 1 | -7/+18 |
| | | |||||
| * | Use more object oriented way for console commands | Bart Visscher | 2013-09-01 | 2 | -31/+55 |
| | | |||||
* | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-19 | 22 | -8/+329 |
|\ \ | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js | ||||
| * \ | Merge pull request #4900 from owncloud/fixing-4488-master | Jörn Friedrich Dreyer | 2013-09-19 | 3 | -2/+13 |
| |\ \ | | | | | | | | | File permissions are part of the ajax response of file upload | ||||
| | * \ | Merge branch 'master' into fixing-4488-master | Thomas Müller | 2013-09-19 | 18 | -135/+442 |
| | |\ \ | |||||
| | * | | | adding comma to get cleaner diffs in the future | Thomas Müller | 2013-09-18 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | 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 |
| | | | | | |||||
| | * | | | add permissions of the file to the json response | Thomas Müller | 2013-09-18 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Merge pull request #4263 from owncloud/search_scrollto | Jörn Friedrich Dreyer | 2013-09-19 | 3 | -5/+44 |
| |\ \ \ \ | | |_|/ / | |/| | | | initial scrollto implementation | ||||
| | * | | | initial scrollto implementation: | Jörn Friedrich Dreyer | 2013-09-17 | 3 | -5/+44 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-18 | 17 | -0/+269 |
| | | | | |||||
* | | | | 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 | ||||
* | | | | simplify conflict template handling, fix reopen after ESC | Jörn Friedrich Dreyer | 2013-09-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | move upload dialog css to separate file | Jörn Friedrich Dreyer | 2013-09-18 | 3 | -85/+120 |
| | | | | |||||
* | | | | 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 | 13 | -266/+610 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -19/+13 |
| |\ \ | | | | | | | | | 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 | 2 | -19/+13 |
| | | | | |||||
| * | | | Merge pull request #4853 from owncloud/external-shared_mimetype-icons | Thomas Müller | 2013-09-15 | 1 | -11/+9 |
| |\ \ \ | | | | | | | | | | | Use external and shared icons in OC.Dialogs.filepicker() | ||||
| | * | | | Use external and shared icons in OC.Dialogs.filepicker() | kondou | 2013-09-14 | 1 | -11/+9 |
| | | | | | |||||
| * | | | | Merge pull request #4501 from owncloud/ajaxfilelist | Thomas Müller | 2013-09-14 | 9 | -175/+475 |
| |\ \ \ \ | | |/ / / | |/| | | | Ajax calls for "files" and "files_trashbin" apps | ||||
| | * | | | Use hash part of URL for IE8 in files app | Vincent Petry | 2013-09-13 | 3 | -9/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 loading mask/spinner to stay fixed on scroll | Vincent Petry | 2013-09-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | 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 | 5 | -21/+45 |
| | | | | | |||||
| | * | | | 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 | 3 | -65/+78 |
| | | | | |