Skip to content

Commit f48044c

Browse files
authored
Merge branch 'next' into anna/next
2 parents ee87f90 + 2e3a846 commit f48044c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

plugins/data_migration/frontend/public/javascripts/countly.views.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
createImageThumbnails: false,
197197
autoProcessQueue: false,
198198
addRemoveLinks: true,
199-
acceptedFiles: 'application/x-gzip',
199+
acceptedFiles: 'application/gzip,application/x-gzip',
200200
dictDefaultMessage: this.i18n('feedback.drop-message'),
201201
dictRemoveFile: this.i18n('feedback.remove-file'),
202202
url: "/i/datamigration/import",
@@ -220,7 +220,7 @@
220220
message: CV.i18n('data-migration.generated-token')
221221
});
222222
self.importDrawerCancelButtonLabel = CV.i18n('data-migration.close');
223-
self.importDrawerSaveButtonLabel = false;
223+
self.importDrawerSaveButtonLabel = "";
224224
}
225225
else {
226226
CountlyHelpers.notify({

plugins/plugins/frontend/public/templates/configurations.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
v-model="searchQuery"
1414
:placeholder="searchPlaceholder"
1515
@focus="onFocus"
16-
@keyup.enter.native="onEnterSearch"
16+
@keydown.enter.native="onEnterSearch"
1717
>
1818
<i slot="prefix" class="el-input__icon el-icon-search"></i>
1919
<i slot="suffix" class="el-input__icon el-icon-circle-close" @click="clearSearch"></i>

0 commit comments

Comments
 (0)