| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core ↵ | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+1 |
| |\ | | | | | | | 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 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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 |
| |/ | |||||
| * | hide excessive logging with a trace flag | Jörn Friedrich Dreyer | 2013-09-18 | 1 | -18/+21 |
| | | |||||
| * | 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 | 1 | -4/+9 |
| |\| | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | refactor upload js & html to always use only js to fill form data | Jörn Friedrich Dreyer | 2013-09-13 | 1 | -9/+11 |
| | | | |||||
| * | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-10 | 1 | -76/+75 |
| |\| | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| | * | Merge pull request #4647 from owncloud/fix_4619 | Thomas Müller | 2013-09-10 | 1 | -0/+3 |
| | |\ | | | | | | | Workaround for IE 9 & 10 for clicking filelist after adding new item | ||||
| | | * | Workaround for IE 9 & 10 for clicking filelist after adding new item | ringmaster | 2013-08-29 | 1 | -0/+3 |
| | | | | |||||
| * | | | remove unused hooks | Jörn Friedrich Dreyer | 2013-09-08 | 1 | -3/+0 |
| | | | | |||||
| * | | | cleanup comments | Jörn Friedrich Dreyer | 2013-09-08 | 1 | -138/+67 |
| | | | | |||||
| * | | | fine ie8 compatability | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -1/+5 |
| | | | | |||||
| * | | | fix page leaving checks | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -97/+33 |
| | | | | |||||
| * | | | fix upload of multiple files | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | refactor replace and autorename resolution in upload.php | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | 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 |
| |\| | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| | * | | Fixed public upload error that prevents upload | Vincent Petry | 2013-09-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Public upload is broken because the file_upload_param variable expected to exist by public.js didn't. This fix sets the variable scope to the window to make it accessible outside. | ||||
| * | | | separate uploading code from progress code, add progress capability detection | Jörn Friedrich Dreyer | 2013-09-05 | 1 | -88/+105 |
| | | | | |||||
| * | | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-04 | 1 | -122/+130 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 1 | -14/+12 |
| | |\| | |||||
| | | * | backport of #4357 to master | Thomas Müller | 2013-08-27 | 1 | -14/+12 |
| | | | | |||||
| | * | | Merge master into oc_preview | Georg Ehrke | 2013-08-26 | 1 | -4/+13 |
| | |\| | |||||
| | | * | remove duplicate code | Thomas Müller | 2013-08-22 | 1 | -0/+7 |
| | | | | |||||
| | * | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-08-23 | 1 | -8/+7 |
| | |\| | |||||
| | | * | Merge branch 'master' into fix_jslint_kondou | kondou | 2013-08-18 | 1 | -312/+312 |
| | | |\ | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| | | * | | Fix a syntax error & have if-conds in an own line | kondou | 2013-08-01 | 1 | -1/+3 |
| | | | | | |||||
| | | * | | Fix some JSLint warnings | kondou | 2013-07-31 | 1 | -12/+11 |
| | | | | | |||||
| | * | | | Merge master into oc_preview | Georg Ehrke | 2013-08-19 | 1 | -310/+312 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | communicate size of newly created file back and update UI | Thomas Müller | 2013-08-16 | 1 | -310/+312 |
| | | |/ | |||||
| | * / | adjust New file dialog for new styles | Jan-Christoph Borchardt | 2013-08-15 | 1 | -1/+1 |
| | |/ | |||||
| * | | reduced complexity, added listing conflicts to dialog | Jörn Friedrich Dreyer | 2013-08-22 | 1 | -64/+162 |
| | | | |||||
| * | | architecture too complex | Jörn Friedrich Dreyer | 2013-08-21 | 1 | -26/+83 |
| | | | |||||
| * | | progress fixes | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -82/+181 |
| | | | |||||
| * | | change filelist ui updates | Jörn Friedrich Dreyer | 2013-08-14 | 1 | -0/+27 |
| | | | |||||
| * | | fix whitespace, check selected files before starting upload | Jörn Friedrich Dreyer | 2013-08-14 | 1 | -304/+406 |
| |/ | |||||
| * | Added file-upload to GIT repo | Roman Geber | 2013-06-26 | 1 | -0/+343 |
| Optimized CSS identifiers | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |