Merge branch 'master' into feature/timezones-package

This commit is contained in:
LouisLam 2021-09-13 19:48:42 +08:00
commit a654e409df

View File

@ -120,11 +120,10 @@
</form> </form>
</template> </template>
<h2 class="mt-5 mb-2"> <div v-if="! settings.disableAuth" class="mt-5 mb-3">
{{ $t("Two Factor Authentication") }} <h2 class="mb-2">
</h2> {{ $t("Two Factor Authentication") }}
</h2>
<div class="mb-3">
<button class="btn btn-primary me-2" type="button" @click="$refs.TwoFADialog.show()">{{ $t("2FA Settings") }}</button> <button class="btn btn-primary me-2" type="button" @click="$refs.TwoFADialog.show()">{{ $t("2FA Settings") }}</button>
</div> </div>
@ -396,7 +395,7 @@ export default {
} }
exportData = JSON.stringify(exportData, null, 4); exportData = JSON.stringify(exportData, null, 4);
let downloadItem = document.createElement("a"); let downloadItem = document.createElement("a");
downloadItem.setAttribute("href", "data:application/json;charset=utf-8," + encodeURI(exportData)); downloadItem.setAttribute("href", "data:application/json;charset=utf-8," + encodeURIComponent(exportData));
downloadItem.setAttribute("download", fileName); downloadItem.setAttribute("download", fileName);
downloadItem.click(); downloadItem.click();
}, },