Merge Minor into main #113

Manually merged
niggl merged 416 commits from dev into main 2021-03-26 16:34:56 +00:00
3 changed files with 5 additions and 10 deletions
Showing only changes of commit cc926e84fb - Show all commits

View File

@ -1,7 +0,0 @@
const config = {
baseurl: 'https://dev.lauf-fuer-kaya.de',
documentserver_key: 'NqZSYTy5AFQ7MppbLW5moqpTk7u7YrNUHKYhKYuThnnya2WpCOIU694hIZT1FzYe',
fallback_username: 'admin',
fallback_password: '72fpTzsev4xUu78QPs2FCbwZ3',
prefersHashRouting: true
};

View File

@ -1,6 +1,8 @@
const config = { const config = {
baseurl: 'http://localhost:4010', baseurl: 'http://localhost:4010',
documentserver_key: 'NqZSYTy5AFQ7MppbLW5moqpTk7u7YrNUHKYhKYuThnnya2WpCOIU694hIZT1FzYe' documentserver_key: 'NqZSYTy5AFQ7MppbLW5moqpTk7u7YrNUHKYhKYuThnnya2WpCOIU694hIZT1FzYe',
// optional // optional
default_username: '',
default_password: '',
prefersHashRouting: true prefersHashRouting: true
}; };

View File

@ -7,8 +7,8 @@
import Footer from "../general/Footer.svelte"; import Footer from "../general/Footer.svelte";
import Toastify from "toastify-js"; import Toastify from "toastify-js";
// ------ // ------
let username = "demo"; let username = config.default_username || "";
let password = "demo"; let password = config.default_password || "";
let is_blocked_by_autologin = false; let is_blocked_by_autologin = false;
let last_loginclick_processed = true; let last_loginclick_processed = true;