From 384cb12df7e338e983d96618ae63cbf971d77b73 Mon Sep 17 00:00:00 2001
From: maxkeiser <maxkeiser@memeware.net>
Date: Thu, 21 Sep 2017 00:53:22 +0000
Subject: [PATCH 1/4] Added updateChannel in #cfg table (#2244)

---
 website/index.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/website/index.html b/website/index.html
index 7e87e3f0..0201aa3e 100644
--- a/website/index.html
+++ b/website/index.html
@@ -724,6 +724,11 @@
             </tr>
           </thead>
           <tbody>
+            <tr>
+              <td>"updateChannel"</td>
+              <td>"stable"</td>
+              <td>The update channel to receive updates from</td>
+            </tr>
             <tr>
               <td>"fontSize"</td>
               <td>12</td>

From e30cbaced4fc512c61b9b59f6782c8aaa7de83e8 Mon Sep 17 00:00:00 2001
From: Alexander Wunschik <dev@wunschik.net>
Date: Thu, 21 Sep 2017 22:39:04 +0200
Subject: [PATCH 2/4] added "quickEdit" to the website docs (#2258)

fixes #2254
---
 website/index.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/website/index.html b/website/index.html
index 0201aa3e..69bf969c 100644
--- a/website/index.html
+++ b/website/index.html
@@ -815,6 +815,11 @@
               <td>false</td>
               <td>If true, selected text will automatically be copied to the clipboard</td>
             </tr>
+            <tr>
+              <td>"quickEdit"</td>
+              <td>false</td>
+              <td>If true, on right click selected text will be copied or pasted if no selection is present (true by default on Windows)</td>
+            </tr>
             <tr>
               <td>"bell"</td>
               <td>"SOUND"</td>

From a31e94eb5ac385cecaecb4d23071d4a8267f1610 Mon Sep 17 00:00:00 2001
From: Mina <mina.chuong@gmail.com>
Date: Fri, 22 Sep 2017 14:53:49 -0700
Subject: [PATCH 3/4] Fixed icon proportions in About window (#2265)

---
 app/config/paths.js      |   2 +-
 app/static/icon96x96.png | Bin 0 -> 2705 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 app/static/icon96x96.png

diff --git a/app/config/paths.js b/app/config/paths.js
index 67977e6d..b29ace2e 100644
--- a/app/config/paths.js
+++ b/app/config/paths.js
@@ -35,7 +35,7 @@ const plugs = {
 };
 const yarn = resolve(__dirname, '../../bin/yarn-standalone.js');
 
-const icon = resolve(__dirname, '../static/icon.png');
+const icon = resolve(__dirname, '../static/icon96x96.png');
 
 const keymapPath = resolve(__dirname, '../keymaps');
 const darwinKeys = join(keymapPath, 'darwin.json');
diff --git a/app/static/icon96x96.png b/app/static/icon96x96.png
new file mode 100644
index 0000000000000000000000000000000000000000..aff0bf5156a2991354fce2fe1dea8396d0865bad
GIT binary patch
literal 2705
zcmV;C3U2j@P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_000T-
zNkl<Zc-rlqUu;xW9>+hwbMH*2(@y`;iJ@IVqKJ(WLv#fr1hS1WKJbA1AQ+N;AY@mN
zny~w{`()yq(ammx2y9GN!e+OUHK<wLjbU|-MAm2m`(T!Cz;^2*3zpKBPCGOAp5H#)
zJJXg$Xo21-a6U<snRcdge&=`3@6Y#~+k(U4a5x+e$L)v=t~wwnGz9g&i0K@&<xLq$
zZK@al?qr9efL!JAY+hHZ@m}tAhH)GGdtA$JX7GRKnefYE(Ut*xYZW7s1-5!Bo10B`
zDMC)wCTPsm!Cvk0Y+hHZ@m`9h&ht9z)Z3~Wb_MVU(7hHN_0J8JQcIe$KlV-PC!Vsj
zXve(^;YA9zn6NRoHuWa$w|I>$8IxHdl5Wy;!TWFBg<tu1X4A`3D$jTtEdAHSX|Lz}
zCwy}8pA@u6vP=3_MyZ!Hk2Wr2W9u4ofBoXSQ<#lS6PdsI<2v!9EU9}Z!ZGjngMZ^U
zgMa1g@?fn;d`t3=@qPkZ<`)Z}GW90CR5aXavSKztxp62M=4heUP5vBmCb+=g$9g$e
zK93MI)Qef~r-emmnSw1)w53{)@s_8k0R>wC4a7qmeXC^*1~haLKLG><wOB0^sKvKh
zM)6P$(8SBQ+Yv<xuo_}Dz^I1N<ZH-{tfP%FwYGGAqKayW5&$6v0yO@*Q4VNmXds`@
z<NJQC&7FrRO68&tFqH?&^{)UCp|!P@r=EI>haP%}`uh4>TRZPil*u^{FqQxthoI|~
zAM*J;TefUr>(;Fd3=A+fHdbqU=OL99P_E>Fpz4w9Spgj#9qin>lN~#DaQygj&YU@e
zwYAWb<~v%=xvBwv6#vb2g`oTHyN~YfZk~SnX~Hn%-FM$*bab@Vmd;DGvH~ch*r^V<
zwlegQM;_t1=bmHz`t{^;ISwB_%<<#LDV1DPcX=kOph*XaL1lI!NJQxB>SEirZ9M+?
z<1{xnbN1|6-h1yohKGl1ZRI>hQ3<dTplb0|%2+X|gdj6>KwVuOPd@o1&p!JsYuBzN
zo6Qo2Ap-*geDJ{s1VK=1E9WtaN{C9l0<44>u`})ia=9Gq*RN;$_U)`%wTe_K1;EJ2
z2uF_|<*Tp0a>@4!s6;D3CBS0wqbCx3<jM}n=ksjXuz~LGZk8`!KCRmw7#QH4ciy2~
zF4x+|dCsH*q8uRQI0t-p6=aN|y}g}{8#mJ3-OXKh-G#`cbf>Be4i0ka)TvrqcM~u@
z1exlSD>xvXPP1y&DxQD-`Tv`Ih#atJ(IPf)-ps=fKTKO&o6~~6gK8Nn0Z4%Nv-agL
z7+^S@;Ljri^p`Gv=bLl6919mNB%94*jG5+$1q&AN*kg~eX3ZMv>+3mx{yfEEkst_A
zbt-FxMd=2fX!#xs{4}A2ct35w{{<tKVO!!a!(U(40oGau2M77+qmStC@29=JoqRrz
z=Xq5}hzOqNk<aH@y?Qlk*RCa<PSe-d$H>S?t?iySEUL@$L`w$?{1l;tn5Yj3uG$A!
zYbg{8y#4muY}>Yt-Me=)FfcIf>aI8;lgZH8*~tSBJV0Y(W36qTXT(X^M00MUrXY-S
zz}3sgVzJ1H6DN4-rI+aG>A9@nRw|X)zkffkyz+`m%$J}LCE<7rz*h-TW8+mYvsi7d
zMMP+6X(5xzO#9jJ@GyJ#?&bB@U+3h>lZ0VdYn$g6Vo?dPCP1y?TPb7WK43Od#LAT`
zdGNspr)|2NK7E?kUVDuL2M*BJ*H>#(=PA*aWE6QWX~bsg0N?jnvt|vQot@FIRHe7K
zmpyy-(9_eyH{X0yYb)n1T5ZJ2sOS_25YAW)UAlBBD^{$awY8Nn3^{h}82k3^<KV%A
z3=Iv{+QxZLwf8biae$e*7`JZSIyyT$DV0im`st_a+qaKHhYnFF6t4Q-rluwqFJ4^L
zkY-A$RN~aBQ;d&~*Lwc0lc*E6vGn6(LR17~W*aiOT#l};E}EO0`S8OJdG*y-dH?<Q
zXRLrOTegfHJ9d!E<z_YPk&zKzeDOv4`uc8eu}?Ib>v+C>OjOZe>{ZX=iU=!Lu4KuQ
zB^)_&gqL4_nU6pIcvhd^(b2(%4I5}~Zl2ZqhK7dNwQCps{r$C`!s|rAXf)rd_+k_c
z$PA>LR4T>l)vNjJv(I?rjW_uG^Ur7f@!x*?Ek}+Vp{=cL=0jHH+_`g%j*i~^vW9>d
zMLb2U;)}0{0G_>K4iFKVnwseC?PdS|{nvaYe(}W@Y}vA9)?!^4h71i2-Q3{^A_sVp
z12Bq@QA9NI$`wM8sxmS%!dq{>MY&wQ<}0ySEOPej*=u_5O@H-AR)DdHv4|3dAQ9rL
z|H=m5sEzhpV<N8&i9-;cB9<r#BNBbn9gj|gYQ#bD#nWnBawLF6u|K-t6(27SL2d;k
zhInxZs+6JCxHQ8~*l`^QQQ7Y)*f<1L9N-o}0#xR@ngc4Gu;)Th5(t$XU=aadJRr`>
z7#D)(904&l&H-RBig<uKMUo5x;t|hzB?K9Xyy8MoG8jcXi-_V!4`K(nyCmlxsl<Pa
z7>#m(h=RuzwIIihK_JStaSrgQ%F(V0N`z^0bVZCa;wqq|ka+LKgJ?&rq6N85I3eQj
zV<Po=G6{Ru<$xrphM-CnWE7d<mZakbaH$l5H)WI9g`hd7B1J@7z)Ut`PL589Sc;e;
z##KU)yZRHOQifJ@faj{9#E{7gzM2EX!~&5ELCIh)-4ixMN!V#YbI%kxnkWQS>QY=1
zP5`OO(Hd{aOv?ea9^P$$=%g42_;}W7K?zfB#I%|NG~SSLPMCA1bizza!k)S+C@H3P
z!qGud*9Rm<<yfL;qZ}Yr2e>`qBoH9VyTqrX<3<c~_0!Rg8$fjhRI8vVT98`-bI&w6
zn#o&~ToO)>%KZU=+mK0|_#}GN2TaKUE(9fmT$%%_I*=3NlEa%SMHm|$%5tZplVNHn
zY{AEi<G;Z<APFjBoQX~&R;7r_27x01Dpe<OCrssdx?2Hr&(zyg6@1UH?1;JlAd>_N
zsIg!KF9oJ(<v;3akjX&WcP^M~(!P?-D0r#?jGIDW-o#_9rAb-2Oz2op>mlB{+|dl*
zzZcqCL5&uQq4|@atq*>S>bgvWuGrLtQGp|0Lc#s{{~Jms1&?;ZGd~a-a%ydvlUDep
ze_HH`JFWEihFs?oz31l}F@qy8Hc{&#-&$nrpsg9|vudr<Uk>==Xiz%lrvfdVL-*WK
z6vgA2bcTC6GBl#M$!&W=G6H~L6~=7Hsjw^uFQB`<3=@9*`J=$ECraL7t87oF><`mM
zTW9chTpcsPKq-)m<<K1R4ZExjj{{{9VBk$x{W}~Ehr{7;IFjane@w}>Op`UP00000
LNkvXXu0mjf4CWqM

literal 0
HcmV?d00001


From acc2230b0e90d502af94710c9976c66c7a5ba635 Mon Sep 17 00:00:00 2001
From: Alexandre Santos <alexandre.santozz@gmail.com>
Date: Mon, 25 Sep 2017 14:21:59 +0100
Subject: [PATCH 4/4] Fix typo in utils customKeys (#2283)

---
 app/config/keymaps.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/config/keymaps.js b/app/config/keymaps.js
index 420bbb9b..e8826990 100644
--- a/app/config/keymaps.js
+++ b/app/config/keymaps.js
@@ -21,23 +21,23 @@ const _setCommandsForKeys = function (commands) {
   }
 };
 
-const _import = function (customsKeys) {
+const _import = function (customKeys) {
   try {
     const mapping = JSON.parse(readFileSync(defaultPlatformKeyPath()));
     _setKeysForCommands(mapping);
-    _setKeysForCommands(customsKeys);
+    _setKeysForCommands(customKeys);
     _setCommandsForKeys(commands);
 
     return {commands, keys};
   } catch (err) {}
 };
 
-const _extend = function (customsKeys) {
-  if (customsKeys) {
-    for (const command in customsKeys) {
+const _extend = function (customKeys) {
+  if (customKeys) {
+    for (const command in customKeys) {
       if (command) {
-        commands[command] = normalize(customsKeys[command]);
-        keys[normalize(customsKeys[command])] = command;
+        commands[command] = normalize(customKeys[command]);
+        keys[normalize(customKeys[command])] = command;
       }
     }
   }