summaryrefslogtreecommitdiffstats
path: root/core/js/oc-dialogs.js
Commit message (Collapse)AuthorAgeFilesLines
* Fix copy conflict dialog translationJörn Friedrich Dreyer2014-06-111-3/+6
| | | | | backport of fileexist template translations with minor fixes
* Append file etag to preview URLsVincent Petry2013-10-281-3/+3
| | | | Fixes #5534
* Fixed conflict dialog in IE8Vincent Petry2013-10-101-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 filesJörn Friedrich Dreyer2013-10-071-1/+1
|
* use {count} instead of 'One' for more versatile translationJörn Friedrich Dreyer2013-09-191-1/+1
|
* use n to translate titleJörn Friedrich Dreyer2013-09-191-1/+7
|
* use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ↵Jörn Friedrich Dreyer2013-09-191-1/+1
| | | | ... maybe something is wrong there
* fix 'event is not defined' errorJörn Friedrich Dreyer2013-09-191-1/+1
|
* indentationJörn Friedrich Dreyer2013-09-181-43/+43
|
* simplify conflict template handling, fix reopen after ESCJörn Friedrich Dreyer2013-09-181-13/+11
|
* Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-171-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-iconsThomas Müller2013-09-151-5/+1
| |\ | | | | | | Use external and shared icons in OC.Dialogs.filepicker()
| | * Use external and shared icons in OC.Dialogs.filepicker()kondou2013-09-141-5/+1
| | |
| * | Merge pull request #4806 from owncloud/oc-dialogs-pageleaveThomas Tanghus2013-09-141-8/+18
| |\ \ | | |/ | |/| Don't popup meaningless alerts when dialog called on page leave
| | * Save two linesThomas Tanghus2013-09-111-3/+1
| | |
| | * Remove test error :PThomas Tanghus2013-09-111-1/+1
| | |
| | * Don't popup meaningless alerts when dialog called on page leaveThomas Tanghus2013-09-111-9/+21
| | |
| * | Use shorter array-conversionkondou2013-09-061-3/+1
| | |
| * | Only use mimetype_list and clean up a bitkondou2013-09-051-10/+12
| | |
| * | Make it possible to pass rawlist.php an JSON array, to filter by more than ↵kondou2013-09-051-4/+11
| |/ | | | | | | one mimetype
* | fix ESC for conflicts dialogJörn Friedrich Dreyer2013-09-081-2/+0
| |
* | close and destroy dialog on ESCJörn Friedrich Dreyer2013-09-081-1/+4
| |
* | show preview for uploading image files on conflictRobin Appelman2013-09-071-16/+71
| |
* | fine ie8 compatabilityJörn Friedrich Dreyer2013-09-061-6/+10
| |
* | fix page leaving checksJörn Friedrich Dreyer2013-09-061-5/+6
| |
* | completely remove dialog on cancel/continueJörn Friedrich Dreyer2013-09-061-1/+2
| |
* | cleanup dead codeJörn Friedrich Dreyer2013-09-051-3/+4
| |
* | separate uploading code from progress code, add progress capability detectionJörn Friedrich Dreyer2013-09-051-8/+5
| |
* | refactor dialog creationJörn Friedrich Dreyer2013-09-041-88/+46
| |
* | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-041-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 #4697kondou2013-09-031-1/+5
| |
| * Use provided mimetype on open. Fix #4696Thomas Tanghus2013-09-021-2/+2
| |
| * Merge branch 'master' into fix_jslint_kondoukondou2013-08-181-4/+0
| |\ | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js
| | * Remove cancel button from filepickerkondou2013-08-171-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 linekondou2013-08-011-7/+21
| | |
| * | Fix some JSLint warningskondou2013-07-311-13/+13
| |/
* | reduced complexity, added listing conflicts to dialogJörn Friedrich Dreyer2013-08-221-116/+189
| |
* | progress fixesJörn Friedrich Dreyer2013-08-161-89/+126
| |
* | change filelist ui updatesJörn Friedrich Dreyer2013-08-141-8/+1
| |
* | fix whitespace, check selected files before starting uploadJörn Friedrich Dreyer2013-08-141-2/+132
|/
* Set default button in oc-dialogsThomas Tanghus2013-06-031-3/+6
|
* Catch double destroy on escape.Thomas Tanghus2013-06-031-1/+3
|
* Replacement for jquery.dialog to fit better with ownCloud design.Thomas Tanghus2013-06-021-9/+9
|
* Remove more obsolete code.Thomas Tanghus2013-05-201-20/+4
|
* Don't set image path in template.Thomas Tanghus2013-05-201-1/+1
|
* Dialogs: Home folder icon instead of '/'.Thomas Tanghus2013-05-171-3/+3
|
* Dialogs: Fix method names.Thomas Tanghus2013-05-171-65/+52
|
* Dialogs: Cleanup.Thomas Tanghus2013-05-171-101/+26
|
* Dialogs: Loose up-button.Thomas Tanghus2013-05-171-14/+0
|
* Dialogs: Make slug show last dir emphasized.Thomas Tanghus2013-05-171-2/+2
|