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 | 9 | -5/+46 |
| | |||||
* | Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading | Thomas Müller | 2013-09-21 | 14 | -27/+26 |
|\ | | | | | namespaces use upcasefirst parts | ||||
| * | remove unneccessary lib in namespace | Jörn Friedrich Dreyer | 2013-09-20 | 10 | -20/+19 |
| | | |||||
| * | namespaces use upcasefirst parts | Jörn Friedrich Dreyer | 2013-09-20 | 13 | -26/+26 |
| | | | | | | | | | | 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 | 64 | -156/+12 |
| | | |||||
* | | 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 | 65 | -9/+955 |
|\ \ | | | | | | | | | | | | | 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 | 64 | -154/+1094 |
| | |\ \ | |||||
| | * | | | 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 | 60 | -1/+895 |
| | | | | |||||
* | | | | 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 | 4 | -85/+121 |
| | | | | |||||
* | | | | 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 | ||||
| * | | | Merge pull request #4872 from owncloud/refactor_upload_progress | Jörn Friedrich Dreyer | 2013-09-18 | 1 | -135/+173 |
| |\ \ \ | | | | | | | | | | | refactor upload progress | ||||
| | * | | | refactor upload progress | Jörn Friedrich Dreyer | 2013-09-16 | 1 | -135/+173 |
| | | | | | |||||
* | | | | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-18 | 3 | -18/+26 |
|\| | | | | |||||
| * | | | | Merge pull request #4708 from owncloud/encryption_fixes | Björn Schießle | 2013-09-18 | 3 | -18/+26 |
| |\ \ \ \ | | |_|/ / | |/| | | | make sure that initial encryption also starts for a fresh installation | ||||
| | * | | | performance improvement, check configuration only if no private key exists | Bjoern Schiessle | 2013-09-17 | 1 | -7/+12 |
| | | | | | |||||
| | * | | | check if stream wrapper is already registered to avoid warning | Bjoern Schiessle | 2013-09-03 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | make sure that initial encryption also starts for a fresh installation | Bjoern Schiessle | 2013-09-03 | 2 | -11/+12 |
| | | | | | |||||
* | | | | | 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 | 41 | -469/+1045 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-16 | 2 | -2/+4 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #4838 from owncloud/refactor_upload_js | Thomas Müller | 2013-09-16 | 3 | -33/+26 |
| |\ \ \ | | | | | | | | | | | 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 | 3 | -33/+26 |
| | | | | | |||||
| * | | | | 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 | 19 | -258/+705 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Ajax calls for "files" and "files_trashbin" apps |