Merge Release/1.10.0 into develop (#1689)

* Update version in package.json for 1.10.0 release Added the beta version for 1.10.0-beta1 release * Fix/only run notes loaded when notes loaded (#1680) * Only run notesLoaded when notes are indeed loaded After querying the noteBucket we run notes loaded with an empty notes array. This causes havoc because we rely on notes being null until notes are loaded. This commit adds a check to ensure there is at least one note before running notesLoaded * Add release notes * Update RELEASE-NOTES.txt * Update signing certificate (#1682) Props to @loremattei for creating these changes * Bump version to v1.10.0-beta2 (#1684) * Add version for release 1.10.0
Automattic · Nov 4, 2019 · a52ad14 · a52ad14
1 parent f6ac7ed
commit a52ad14
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,6 +1,6 @@
 # Changelog
 
-## Future release
+## [v1.10.0]
 
 ### Enhancements
 
@@ -14,6 +14,7 @@
  - Rework WordPress.com signin to prevent infinite looping and login failures [#1627](https://github.com/Automattic/simplenote-electron/pull/1627)
  - Fixed bug that only shows the first line of text in note list preview [#1647](https://github.com/Automattic/simplenote-electron/pull/1647)
  - Update link to release-notes in updater config: CHANGELOG -> RELEASE_NOTES
+ - Stop showing that there are no notes when initially loading notes from the server. [#1680](https://github.com/Automattic/simplenote-electron/pull/1680)
 
  ### Other changes
 

diff --git a/after_sign_hook.js b/after_sign_hook.js
@@ -7,7 +7,6 @@ module.exports = async function(params) {
   if (process.platform !== 'darwin') {
     return;
   }
-  console.log('afterSign hook triggered', params);
 
   if (!process.env.CIRCLE_TAG || process.env.CIRCLE_TAG.length === 0) {
     console.log('Not on a tag. Skipping notarization');

diff --git a/lib/flux/app-state.js b/lib/flux/app-state.js
@@ -266,7 +266,9 @@ export const actionMap = new ActionMap({
                 cursor.continue();
               } else {
                 debug(`noteCount: ${notes.length}`);
-                dispatch(this.action('notesLoaded', { notes: notes }));
+                if (notes.length) {
+                  dispatch(this.action('notesLoaded', { notes: notes }));
+                }
               }
             };
           });

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "email": "[email protected]"
   },
   "productName": "Simplenote",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "main": "desktop/index.js",
   "license": "GPL-2.0",
   "homepage": "https://simplenote.com",

diff --git a/resources/certificates/mac.p12.enc b/resources/certificates/mac.p12.enc