Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix copy conflict dialog translation | Jörn Friedrich Dreyer | 2014-06-11 | 1 | -3/+6 |
| | | | | | backport of fileexist template translations with minor fixes | ||||
* | Append file etag to preview URLs | Vincent Petry | 2013-10-28 | 1 | -3/+3 |
| | | | | Fixes #5534 | ||||
* | Fixed conflict dialog in IE8 | Vincent Petry | 2013-10-10 | 1 | -1/+1 |
| | | | | | - Fixed JS error that prevent the conflict dialog to open #5060 - Fixed JS error that prevented the overwrite case to run | ||||
* | use correct property for mimetype of existing files | Jörn Friedrich Dreyer | 2013-10-07 | 1 | -1/+1 |
| | |||||
* | use {count} instead of 'One' for more versatile translation | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+1 |
| | |||||
* | use n to translate title | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+7 |
| | |||||
* | use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ↵ | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+1 |
| | | | | ... maybe something is wrong there | ||||
* | fix 'event is not defined' error | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+1 |
| | |||||
* | indentation | Jörn Friedrich Dreyer | 2013-09-18 | 1 | -43/+43 |
| | |||||
* | simplify conflict template handling, fix reopen after ESC | Jörn Friedrich Dreyer | 2013-09-18 | 1 | -13/+11 |
| | |||||
* | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -14/+27 |
|\ | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Merge pull request #4853 from owncloud/external-shared_mimetype-icons | Thomas Müller | 2013-09-15 | 1 | -5/+1 |
| |\ | | | | | | | Use external and shared icons in OC.Dialogs.filepicker() | ||||
| | * | Use external and shared icons in OC.Dialogs.filepicker() | kondou | 2013-09-14 | 1 | -5/+1 |
| | | | |||||
| * | | Merge pull request #4806 from owncloud/oc-dialogs-pageleave | Thomas Tanghus | 2013-09-14 | 1 | -8/+18 |
| |\ \ | | |/ | |/| | Don't popup meaningless alerts when dialog called on page leave | ||||
| | * | Save two lines | Thomas Tanghus | 2013-09-11 | 1 | -3/+1 |
| | | | |||||
| | * | Remove test error :P | Thomas Tanghus | 2013-09-11 | 1 | -1/+1 |
| | | | |||||
| | * | Don't popup meaningless alerts when dialog called on page leave | Thomas Tanghus | 2013-09-11 | 1 | -9/+21 |
| | | | |||||
| * | | Use shorter array-conversion | kondou | 2013-09-06 | 1 | -3/+1 |
| | | | |||||
| * | | Only use mimetype_list and clean up a bit | kondou | 2013-09-05 | 1 | -10/+12 |
| | | | |||||
| * | | Make it possible to pass rawlist.php an JSON array, to filter by more than ↵ | kondou | 2013-09-05 | 1 | -4/+11 |
| |/ | | | | | | | one mimetype | ||||
* | | fix ESC for conflicts dialog | Jörn Friedrich Dreyer | 2013-09-08 | 1 | -2/+0 |
| | | |||||
* | | close and destroy dialog on ESC | Jörn Friedrich Dreyer | 2013-09-08 | 1 | -1/+4 |
| | | |||||
* | | show preview for uploading image files on conflict | Robin Appelman | 2013-09-07 | 1 | -16/+71 |
| | | |||||
* | | fine ie8 compatability | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -6/+10 |
| | | |||||
* | | fix page leaving checks | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -5/+6 |
| | | |||||
* | | completely remove dialog on cancel/continue | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -1/+2 |
| | | |||||
* | | cleanup dead code | Jörn Friedrich Dreyer | 2013-09-05 | 1 | -3/+4 |
| | | |||||
* | | separate uploading code from progress code, add progress capability detection | Jörn Friedrich Dreyer | 2013-09-05 | 1 | -8/+5 |
| | | |||||
* | | refactor dialog creation | Jörn Friedrich Dreyer | 2013-09-04 | 1 | -88/+46 |
| | | |||||
* | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-04 | 1 | -19/+33 |
|\| | | | | | | | | | | | | | | | | | 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 | ||||
| * | Add previews to OC.dialogs.filepicker(); Fix #4697 | kondou | 2013-09-03 | 1 | -1/+5 |
| | | |||||
| * | Use provided mimetype on open. Fix #4696 | Thomas Tanghus | 2013-09-02 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' into fix_jslint_kondou | kondou | 2013-08-18 | 1 | -4/+0 |
| |\ | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| | * | Remove cancel button from filepicker | kondou | 2013-08-17 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | Having the cancel button in the bottom right corner was a bit confusing. It's useless anyways, since there's a X in the top right. | ||||
| * | | Fix a syntax error & have if-conds in an own line | kondou | 2013-08-01 | 1 | -7/+21 |
| | | | |||||
| * | | Fix some JSLint warnings | kondou | 2013-07-31 | 1 | -13/+13 |
| |/ | |||||
* | | reduced complexity, added listing conflicts to dialog | Jörn Friedrich Dreyer | 2013-08-22 | 1 | -116/+189 |
| | | |||||
* | | progress fixes | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -89/+126 |
| | | |||||
* | | change filelist ui updates | Jörn Friedrich Dreyer | 2013-08-14 | 1 | -8/+1 |
| | | |||||
* | | fix whitespace, check selected files before starting upload | Jörn Friedrich Dreyer | 2013-08-14 | 1 | -2/+132 |
|/ | |||||
* | Set default button in oc-dialogs | Thomas Tanghus | 2013-06-03 | 1 | -3/+6 |
| | |||||
* | Catch double destroy on escape. | Thomas Tanghus | 2013-06-03 | 1 | -1/+3 |
| | |||||
* | Replacement for jquery.dialog to fit better with ownCloud design. | Thomas Tanghus | 2013-06-02 | 1 | -9/+9 |
| | |||||
* | Remove more obsolete code. | Thomas Tanghus | 2013-05-20 | 1 | -20/+4 |
| | |||||
* | Don't set image path in template. | Thomas Tanghus | 2013-05-20 | 1 | -1/+1 |
| | |||||
* | Dialogs: Home folder icon instead of '/'. | Thomas Tanghus | 2013-05-17 | 1 | -3/+3 |
| | |||||
* | Dialogs: Fix method names. | Thomas Tanghus | 2013-05-17 | 1 | -65/+52 |
| | |||||
* | Dialogs: Cleanup. | Thomas Tanghus | 2013-05-17 | 1 | -101/+26 |
| | |||||
* | Dialogs: Loose up-button. | Thomas Tanghus | 2013-05-17 | 1 | -14/+0 |
| | |||||
* | Dialogs: Make slug show last dir emphasized. | Thomas Tanghus | 2013-05-17 | 1 | -2/+2 |
| |