Merge branch 'next' into anna/next

Author: Cookiezaurs

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

@@ -196,7 +196,7 @@
                     createImageThumbnails: false,
                     autoProcessQueue: false,
                     addRemoveLinks: true,
-                    acceptedFiles: 'application/x-gzip',
+                    acceptedFiles: 'application/gzip,application/x-gzip',
                     dictDefaultMessage: this.i18n('feedback.drop-message'),
                     dictRemoveFile: this.i18n('feedback.remove-file'),
                     url: "/i/datamigration/import",
@@ -220,7 +220,7 @@
                                 message: CV.i18n('data-migration.generated-token')
                             });
                             self.importDrawerCancelButtonLabel = CV.i18n('data-migration.close');
-                            self.importDrawerSaveButtonLabel = false;
+                            self.importDrawerSaveButtonLabel = "";
                         }
                         else {
                             CountlyHelpers.notify({

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

@@ -13,7 +13,7 @@
                 v-model="searchQuery"
                 :placeholder="searchPlaceholder"
                 @focus="onFocus"
-                @keyup.enter.native="onEnterSearch"
+                @keydown.enter.native="onEnterSearch"
             >
                 <i slot="prefix" class="el-input__icon el-icon-search"></i>
                 <i slot="suffix" class="el-input__icon el-icon-circle-close" @click="clearSearch"></i>