Merge branch 'master' into huangzheng2016-master

# Conflicts: # gui/builtinPreferenceViews/pyfaEsiPreferences.py
2022-05-08 12:35:46 -04:00
parent 3c6eb6d054 cceaed8d61
commit 5a6fe373f1
109 changed files with 25968 additions and 6499 deletions
--- a/service/settings.py
+++ b/service/settings.py
@@ -375,7 +375,9 @@ class EsiSettings:
            "clientSecret": "",
            "timeout": 60,
            "server": "Tranquility",
-            "exportCharges": True}
+            "exportCharges": True,
+            "enforceJwtExpiration": True
+        }

        self.settings = SettingsProvider.getInstance().getSettings(
                "pyfaServiceEsiSettings",