Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 |