upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-26 08:38:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 31

Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog

Browse source
This commit is contained in:
Jörn Friedrich Dreyer 2013-09-19 11:33:34 +02:00
commit 1bba800e47
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/js/file-upload.js
View file

@ -169,7 +169,7 @@ OC.Upload = {
},
/**
* TODO checks the list of existing files prior to uploading and shows a simple dialog to choose
* skip all, replace all or choosw which files to keep
* skip all, replace all or choose which files to keep
* @param {array} selection of files to upload
* @param {object} callbacks - object with several callback methods
* @param {function} callbacks.onNoConflicts

4
apps/files/js/files.js
View file

@ -499,7 +499,7 @@ var folderDropOptions={
$('#notification').fadeIn();
}
} else {
OC.dialogs.alert(t('Error moving file'), t('core', 'Error'));
OC.dialogs.alert(t('files', 'Error moving file'), t('files', 'Error'));
}
});
});
@ -537,7 +537,7 @@ var crumbDropOptions={
$('#notification').fadeIn();
}
} else {
OC.dialogs.alert(t('Error moving file'), t('core', 'Error'));
OC.dialogs.alert(t('files', 'Error moving file'), t('files', 'Error'));
}
});
});