Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-23 | 94 | -793/+2013 |
|\ | |||||
| * | [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 |
| |\| | | |||||
| * | | | unify .original div to fix css in firefox, clear:left to fix filename wrappin... | Jörn Friedrich Dreyer | 2013-09-10 | 1 | -7/+4 |
| * | | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-10 | 10 | -109/+129 |
| |\ \ \ | |||||
| * | | | | whitespace and indentation fixes | Jörn Friedrich Dreyer | 2013-09-08 | 1 | -28/+28 |
| * | | | | remove unused hooks | Jörn Friedrich Dreyer | 2013-09-08 | 2 | -23/+0 |
| * | | | | cleanup comments | Jörn Friedrich Dreyer | 2013-09-08 | 2 | -203/+75 |
| * | | | | fine ie8 compatability | Jörn Friedrich Dreyer | 2013-09-06 | 2 | -1/+9 |
| * | | | | fix page leaving checks | Jörn Friedrich Dreyer | 2013-09-06 | 2 | -105/+46 |
| * | | | | fix upload to folder | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -16/+3 |
| * | | | | fix upload of multiple files | Jörn Friedrich Dreyer | 2013-09-06 | 2 | -25/+40 |
| * | | | | refactor replace and autorename resolution in upload.php | Jörn Friedrich Dreyer | 2013-09-06 | 2 | -41/+35 |
| * | | | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-06 | 6 | -9/+16 |
| |\ \ \ \ | |||||
| * | | | | | cleanup dead code | Jörn Friedrich Dreyer | 2013-09-05 | 1 | -30/+38 |
| * | | | | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-05 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | separate uploading code from progress code, add progress capability detection | Jörn Friedrich Dreyer | 2013-09-05 | 3 | -114/+131 |