Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-27 | 2 | -3/+11 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-25 | 95 | -796/+2045 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | use \OC::$server->getPreviewManager() instead of \OCP\Preview | Thomas Müller | 2013-09-17 | 2 | -4/+4 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'master' into move-aborted-upload-detection-into-plugin-master | Thomas Müller | 2013-09-30 | 3 | -5/+14 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-29 | 1 | -2/+3 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-27 | 2 | -3/+11 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* / | | | | | | | fixing copyright and add class documentation | Thomas Müller | 2013-09-25 | 1 | -0/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-24 | 5 | -1/+26 | |
* | | | | | | | Fix not displaying "Upload something!" message | kondou | 2013-09-23 | 1 | -1/+1 | |
* | | | | | | | 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 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | ||||||
| * | | | | | 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 | |
* | | | | | | [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 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | 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 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge pull request #4900 from owncloud/fixing-4488-master | Jörn Friedrich Dreyer | 2013-09-19 | 3 | -2/+13 | |
| |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ | 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: | Jörn Friedrich Dreyer | 2013-09-17 | 3 | -5/+44 | |
| | |/ / / / / | ||||||
| * | | | | | | [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 i... | Jörn Friedrich Dreyer | 2013-09-19 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core i... | Thomas Müller | 2013-09-19 | 1 | -26/+26 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | |
* | | | | | | | 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 | |
|\| | | | | | | ||||||
| * | | | | | | 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 | |
|\| | | | | | ||||||
| * | | | | | 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 | 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() | kondou | 2013-09-14 | 1 | -11/+9 |