Merge remote-tracking branch 'origin/feature/autoreload-db' into develop

2016-11-25 12:04:44 -05:00
parent 7fb33653ad 3cccfd97d2
commit 3d249365c2
39 changed files with 28723 additions and 495 deletions
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -103,6 +103,7 @@ void Config::init(const QString& fileName)
    m_defaults.insert("security/lockdatabaseidle", false);
    m_defaults.insert("security/lockdatabaseidlesec", 10);
    m_defaults.insert("security/lockdatabaseminimize", false);
+    m_defaults.insert("security/passwordsrepeat", false);
    m_defaults.insert("security/passwordscleartext", false);
    m_defaults.insert("security/autotypeask", true);
    m_defaults.insert("GUI/Language", "system");