Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5134 from owncloud/trashbin-homeiconbroken | Vincent Petry | 2013-10-09 | 1 | -3/+6 |
|\ | |||||
| * | Do not call changeDirectory() when no dir set on breadcrumb | Vincent Petry | 2013-10-04 | 1 | -3/+6 |
* | | Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes | VicDeo | 2013-10-07 | 4 | -39/+6 |
|\ \ | |||||
| * | | remove double uri encoding | Jörn Friedrich Dreyer | 2013-10-07 | 1 | -4/+4 |
| * | | canceling individual uploads is currently impossible because there is no plac... | Jörn Friedrich Dreyer | 2013-10-07 | 2 | -34/+1 |
| * | | use !== comparison | Jörn Friedrich Dreyer | 2013-10-07 | 1 | -1/+1 |
| |/ | |||||
* / | Fix breadcrumb to reinit dnd after ajax nav #5064 | Vincent Petry | 2013-10-07 | 1 | -6/+8 |
|/ | |||||
* | Merge pull request #4933 from owncloud/1376-filesappplussigninurlbug | Vincent Petry | 2013-10-04 | 1 | -2/+6 |
|\ | |||||
| * | Replace plus sign with space in files app URL #4932 | Vincent Petry | 2013-09-20 | 1 | -2/+6 |
* | | Shortened notification message that was too long | Vincent Petry | 2013-10-04 | 1 | -1/+1 |
* | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-30 | 1 | -1/+5 |
|\ \ | |||||
| * | | implement previews for public upload | Georg Ehrke | 2013-09-23 | 1 | -1/+5 |
| |/ | |||||
* | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-23 | 6 | -581/+1411 |
|\| | |||||
| * | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-19 | 3 | -6/+53 |
| |\ | |||||
| | * | Merge pull request #4900 from owncloud/fixing-4488-master | Jörn Friedrich Dreyer | 2013-09-19 | 2 | -1/+11 |
| | |\ | |||||
| | | * | Merge branch 'master' into fixing-4488-master | Thomas Müller | 2013-09-19 | 1 | -135/+173 |
| | | |\ | |||||
| | | * | | 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 |
| | * | | | Merge pull request #4263 from owncloud/search_scrollto | Jörn Friedrich Dreyer | 2013-09-19 | 2 | -5/+41 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | initial scrollto implementation: | Jörn Friedrich Dreyer | 2013-09-17 | 2 | -5/+41 |
| | | |/ | |||||
| * | | | 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 |
| * | | | 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 | 4 | -140/+351 |
| |\| | |||||
| * | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-10 | 1 | -76/+75 |
| |\ \ | |||||
| * | | | 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 | 1 | -1/+5 |
| * | | | 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 | 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 |
| |\ \ \ | |||||
| * | | | | separate uploading code from progress code, add progress capability detection | Jörn Friedrich Dreyer | 2013-09-05 | 3 | -114/+131 |
| * | | | | refactor dialog creation | Jörn Friedrich Dreyer | 2013-09-04 | 1 | -5/+7 |
| * | | | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-04 | 5 | -350/+303 |
| |\ \ \ \ | |||||
| * | | | | | 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 | 5 | -335/+925 |
| * | | | | | progress fixes | Jörn Friedrich Dreyer | 2013-08-16 | 4 | -212/+347 |