From e1c75659f0291b86602e3503c811b49e62e06682 Mon Sep 17 00:00:00 2001 From: "Jonathan (JB) Belcher" Date: Mon, 28 Oct 2019 11:04:23 -0400 Subject: [PATCH 1/5] Update version in package.json for 1.10.0 release Added the beta version for 1.10.0-beta1 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 223a858c4..0fb057480 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "email": "support@simplenote.com" }, "productName": "Simplenote", - "version": "1.9.1", + "version": "1.10.0-beta1", "main": "desktop/index.js", "license": "GPL-2.0", "homepage": "https://simplenote.com", From da7eac7562abc99e8e0d4ac82543739768f43358 Mon Sep 17 00:00:00 2001 From: Jonathan Belcher Date: Wed, 30 Oct 2019 15:41:21 -0400 Subject: [PATCH 2/5] 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 --- RELEASE-NOTES.txt | 1 + lib/flux/app-state.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index e9c5ee8e5..3e91dfa11 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -13,6 +13,7 @@ - Rework WordPress.com signin to prevent infinite looping and login failures [#1627](https://github.com/Automattic/simplenote-electron/pull/1627) - 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) ## [v1.9.1] diff --git a/lib/flux/app-state.js b/lib/flux/app-state.js index eb24d6d5e..2d21df49a 100644 --- 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 })); + } } }; }); From f8189cf7ed1df40d571e1fbd0832d1aef0bb7b2a Mon Sep 17 00:00:00 2001 From: Dennis Snell Date: Thu, 31 Oct 2019 10:51:53 -0400 Subject: [PATCH 3/5] Update signing certificate (#1682) Props to @loremattei for creating these changes --- after_sign_hook.js | 1 - resources/certificates/mac.p12.enc | Bin 3296 -> 3296 bytes 2 files changed, 1 deletion(-) diff --git a/after_sign_hook.js b/after_sign_hook.js index 542259b2c..a2d78ecab 100644 --- 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/resources/certificates/mac.p12.enc b/resources/certificates/mac.p12.enc index de0222e0b2bff3ac935cd3f4b515c80b84be6b84..1a33a3ebf500017681900a5846a2cd5c5bb6568b 100644 GIT binary patch literal 3296 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 eNr0akg;J7d=-A(5fNY?u5Tpsa*vS3tqQ^w4ih ztohQD8Q!;aekQ5NaN|k)#u2ude2!O{N;@4EiaXwRq~qw@KHe@|-||i^z&Yrk1(=2C zzG{c~S(^yA@zH8AKXhg+I1S{^VSE#o4+!YDxX~w!Os0)N()E22g+D_js(WH@bSum0 zl0Gl`<=eREm+Kr%bwM~?x!e8jG0~q(BB?Zk*5K6AS-uAlX7PbC&)FuUU;KcC%%-94 zm1Sf4450Eahb)ni{oGz%Su=_d3Dv=8{j{~WF`@-S2O`5>@I z0fIF`8XfLIJ!wk@SEWqQMQ%~%9nOoF(){r=Sekmh3{8FE;Gn#rvfUGqo4kLf(sgeVNS_r z7H~pls8xUKY1kqSdaLRHX@TF~mg+^_Z2m00fAeN6xm1&cPq+@y^pCj>(v zqg4klYwU&d4LflCOPqBNh>($@rOdc8TQkNVWPwi@Oto-BXz8nLADif(Mk3U8emkvl z`T;IaA3;A~dQOV&W*S+9FGls;U-6_S}DNd2Rjo#=e z3r)RmzL^r2^$qmwGR;ewJE61UUU%&URQPlq!G13R8 zQ_x^gZZ})^Q5B{Oc>+-cgY127*+no>j;oBu6CA$jY)<5AEi@F<0Nmf!{zCmNJ-CWpLJzrv^V3 z=(^J2BuJS4tsXJ&LRBzH?vqj<{WbJj$rJaTXpaW=B!h!1U)FbSw*cWA&pG_BReIop z2zFc$V$mue&`V!K4f(UCGeD_E`rPg#WlH^3 zfv}{!vi(}7)o)ti<1d-G#OzXOORNeVOS^eWlG1`y!q1k?Iqf6%|m*;@O>1jU#a zUnD_snN!hzKz+Y|v9P%|bSNrB^rMu9GcvUEd(b9d=dO&MaW8{mghM4}x9yrK;k&J^JPm!wHQrizV#i_tZzh6>0>I#*JL(V z&BG@1{*jXmuuaCc$z?LvVu>`ciPA46k0b0jT1ugHF?$GYTi_Nar?KYjj5hIiKXfrH zjO1xQm`P=it$q~N;P$5NVEZrIYkO1R=!*=mmvs~Z@J^o|t|cP;nF1up3$eOzuKllP zbrcxaNV2-(4Al!)#+ah0W5q zG+9M2Kv2Q5J^vluiCYP8qI35C4-Ay(cVgrMyXWZrb ze)8C+{baJsjl_FScBkwxXA*PpC*r==kO6@ReMuZQg#t>nhbp`1m5wEaar_VFa333` zf9h%ftdJZcS>DAnw#-~1k)@(!u5Nq?>!@H=G}1oag1CR8pAoL(z>jp-~C1wWJO4TVm14b7ZjE`#)n zVyIj}jZunuvvT6SskFLUVku?i1asYk4t^IY3{l?dJKE@zrT8#Flj!5o%e;n6L$nou zK;vht(FK8glHvhglG|Nm^@q4gOvMQXkJ zCEm==#{<0hS3B_U5myDcXXYbyS$xDh%z{eWbmP^C-9eYHv{f<`zRLFcDnQ{zb0v)O zGIWy&8<hKcxazw~-)?E5x) zbwAzWqz+f!L?yn%5RxtlWYIx3-;cN){UITf$^B&jMZ5{UqemTYd%Zv!_hY?-9y>)Y zT`TJH5|QZ^kdNh%(TqI3C=&g zdyMqZB_Cc{e)O~QUehc)pq`P@OZsFnNUm#aR8GW#dqWn|+;ejCF$xEAWFT3I-ka4|ZaQZ(UKI6l- zrLPNXgx%qs?(g)7^z3P$kCl`JU~;tMx*0|Ax4Y&@?ajO=jIYEPmjnop2Nr^oo*?DO zuPk;XPpuvNVrYo%C_V;m^~2Y{l)W>`LCsLXRr2nlGrjS?@6wZUC6!k*Ez2 ztTwrh68xb)hH}@<>1on3URCI#ep0=@txVCBYQ3*0Hrso{q;&<*ZcJkPs6)ex)w7ljK>AEKxqe{COz>CVA#MCb5^e6+OBc zNIZqcf_l?TDWEBL-5vz1oATir_p_TkQ$*CkL*-1>;9GCdw(kX(%@_=$rXi8|3jdSn zQ|y72LR5(UV z)unZ#9g>QG^1Tr`>WboLXtg=IM)U>)!hb(Lbl;7%8R_*qhhMBf?NXN~l--x*Mo{!`a0%~#Y!$C-$*fIKZ_<>~hq eu!TIb)ojxOJ)Glfk1&;{NsB1} From 8981b16ea8b4c28e24b3e360cc229ec32faec58d Mon Sep 17 00:00:00 2001 From: Jonathan Belcher Date: Fri, 1 Nov 2019 10:38:14 -0400 Subject: [PATCH 4/5] Bump version to v1.10.0-beta2 (#1684) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0fb057480..89171d2e5 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "email": "support@simplenote.com" }, "productName": "Simplenote", - "version": "1.10.0-beta1", + "version": "1.10.0-beta2", "main": "desktop/index.js", "license": "GPL-2.0", "homepage": "https://simplenote.com", From a5e194730a2acf22f3fb615b8122a8ef9b3f2658 Mon Sep 17 00:00:00 2001 From: "Jonathan (JB) Belcher" Date: Mon, 4 Nov 2019 11:19:09 -0500 Subject: [PATCH 5/5] Add version for release 1.10.0 --- RELEASE-NOTES.txt | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 3e91dfa11..684c768be 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,6 +1,6 @@ # Changelog -## Future release +## [v1.10.0] ### Enhancements diff --git a/package.json b/package.json index 89171d2e5..bc864c19b 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "email": "support@simplenote.com" }, "productName": "Simplenote", - "version": "1.10.0-beta2", + "version": "1.10.0", "main": "desktop/index.js", "license": "GPL-2.0", "homepage": "https://simplenote.com",