Merge branch 'release-1.9'

app/scripts/views/app-view.js

@@ -272,8 +272,8 @@ const AppView = Backbone.View.extend({
         this.views.menu.switchVisibility(false);
     },
 
-    showEditGroup() {
-        this.showPanelView(new GrpView());
+    showEditGroup(group) {
+        this.showPanelView(new GrpView({ model: group }));
     },
 
     showEditTag() {
@@ -661,8 +661,7 @@ const AppView = Backbone.View.extend({
 
     editGroup(group) {
         if (group && !(this.views.panel instanceof GrpView)) {
-            this.showEditGroup();
-            this.views.panel.showGroup(group);
+            this.showEditGroup(group);
         } else {
             this.showEntries();
         }

app/scripts/views/grp-view.js

@@ -24,24 +24,22 @@ const GrpView = Backbone.View.extend({
 
     render() {
         this.removeSubView();
-        if (this.model) {
-            this.renderTemplate(
-                {
-                    title: this.model.get('title'),
-                    icon: this.model.get('icon') || 'folder',
-                    customIcon: this.model.get('customIcon'),
-                    enableSearching: this.model.getEffectiveEnableSearching(),
-                    readonly: this.model.get('top'),
-                    canAutoType: AutoType.enabled,
-                    autoTypeSeq: this.model.get('autoTypeSeq'),
-                    autoTypeEnabled: this.model.getEffectiveEnableAutoType(),
-                    defaultAutoTypeSeq: this.model.getParentEffectiveAutoTypeSeq()
-                },
-                true
-            );
-            if (!this.model.get('title')) {
-                this.$el.find('#grp__field-title').focus();
-            }
+        this.renderTemplate(
+            {
+                title: this.model.get('title'),
+                icon: this.model.get('icon') || 'folder',
+                customIcon: this.model.get('customIcon'),
+                enableSearching: this.model.getEffectiveEnableSearching(),
+                readonly: this.model.get('top'),
+                canAutoType: AutoType.enabled,
+                autoTypeSeq: this.model.get('autoTypeSeq'),
+                autoTypeEnabled: this.model.getEffectiveEnableAutoType(),
+                defaultAutoTypeSeq: this.model.getParentEffectiveAutoTypeSeq()
+            },
+            true
+        );
+        if (!this.model.get('title')) {
+            this.$el.find('#grp__field-title').focus();
         }
         this.createScroll({
             root: this.$el.find('.grp')[0],
@@ -59,11 +57,6 @@ const GrpView = Backbone.View.extend({
         }
     },
 
-    showGroup(group) {
-        this.model = group;
-        this.render();
-    },
-
     changeTitle(e) {
         const title = $.trim(e.target.value);
         if (title) {

desktop/app.js

@@ -66,6 +66,7 @@ app.on('window-all-closed', () => {
 app.on('ready', () => {
     appReady = true;
     setAppOptions();
+    setSystemAppearance();
     createMainWindow();
     setGlobalShortcuts();
     subscribePowerEvents();
@@ -147,6 +148,14 @@ function readAppSettings() {
     }
 }
 
+function setSystemAppearance() {
+    if (process.platform === 'darwin') {
+        if (electron.systemPreferences.isDarkMode()) {
+            electron.systemPreferences.setAppLevelAppearance('dark');
+        }
+    }
+}
+
 function createMainWindow() {
     const appSettings = readAppSettings();
     const windowOptions = {

desktop/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "KeeWeb",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "KeeWeb",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "Free cross-platform password manager compatible with KeePass",
   "main": "main.js",
   "homepage": "https://keeweb.info",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "keeweb",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "keeweb",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "Free cross-platform password manager compatible with KeePass",
   "main": "Gruntfile.js",
   "private": true,

release-notes.md

@@ -1,7 +1,15 @@
 Release notes
 -------------
-##### v1.9.3 (TBD)
+##### v1.10 (TBD)
+`+` config option to disable xml export (canExportXml)  
+`+` xml files can be now opened as regular files  
+`-` fix #1154: relative Destination header in WebDAV MOVE  
+`-` fix #1129: webdav storage error on Unicode filenames  
+
+##### v1.9.3 (2019-09-07)
+`-` fixed group settings not being displayed  
 `-` fixed menu padding issues in some browsers  
+`-` fixed titlebar color on macOS dark theme  
 
 ##### v1.9.2 (2019-08-22)
 `-` fix #1235: custom themes loading