aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay A <avijayr@protonmail.com>2021-06-03 19:46:40 +0530
committerLibravatar Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>2021-06-03 22:10:17 +0530
commitc5bdbca91466667f36be08881ecaff31006b06a8 (patch)
tree6048025b6042a1733c5ff90831c1c7b8db96920c
parentAdjust link opening behavior (diff)
downloadferdi-c5bdbca91466667f36be08881ecaff31006b06a8.tar.gz
ferdi-c5bdbca91466667f36be08881ecaff31006b06a8.tar.zst
ferdi-c5bdbca91466667f36be08881ecaff31006b06a8.zip
Upgraded electron to '13.1.0'.
-rw-r--r--package-lock.json36
-rw-r--r--package.json8
-rw-r--r--src/components/auth/Pricing.js2
-rw-r--r--src/components/services/content/ErrorHandlers/WebviewErrorHandler.js2
-rw-r--r--src/components/services/tabs/TabItem.js2
-rw-r--r--src/components/settings/settings/EditSettingsForm.js6
6 files changed, 28 insertions, 28 deletions
diff --git a/package-lock.json b/package-lock.json
index 73df6456..b4cebea6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -372,9 +372,9 @@
372 } 372 }
373 }, 373 },
374 "@babel/cli": { 374 "@babel/cli": {
375 "version": "7.13.16", 375 "version": "7.14.3",
376 "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.13.16.tgz", 376 "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.14.3.tgz",
377 "integrity": "sha512-cL9tllhqvsQ6r1+d9Invf7nNXg/3BlfL1vvvL/AdH9fZ2l5j0CeBcoq6UjsqHpvyN1v5nXSZgqJZoGeK+ZOAbw==", 377 "integrity": "sha512-zU4JLvwk32ay1lhhyGfqiRUSPoltVDjhYkA3aQq8+Yby9z30s/EsFw1EPOHxWG9YZo2pAGfgdRNeHZQAYU5m9A==",
378 "dev": true, 378 "dev": true,
379 "requires": { 379 "requires": {
380 "@nicolo-ribaudo/chokidar-2": "2.1.8-no-fsevents", 380 "@nicolo-ribaudo/chokidar-2": "2.1.8-no-fsevents",
@@ -11218,9 +11218,9 @@
11218 "dev": true 11218 "dev": true
11219 }, 11219 },
11220 "boolean": { 11220 "boolean": {
11221 "version": "3.0.4", 11221 "version": "3.1.0",
11222 "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.4.tgz", 11222 "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.1.0.tgz",
11223 "integrity": "sha512-5pyOr+w2LNN72F2mAq6J0ckHUfJYSgRKma7e/wlcMMhgOLV9OI0ERhERYXxUqo+dPyVxcbXKy9n+wg13+LpNnA==", 11223 "integrity": "sha512-K6r5tvO1ykeYerI7jIyTvSFw2l6D6DzqkljGj2E2uyYAAdDo2SV4qGJIV75cHIQpTFyb6BB0BEHiDdDrFsNI+g==",
11224 "dev": true, 11224 "dev": true,
11225 "optional": true 11225 "optional": true
11226 }, 11226 },
@@ -14964,9 +14964,9 @@
14964 } 14964 }
14965 }, 14965 },
14966 "electron": { 14966 "electron": {
14967 "version": "13.0.1", 14967 "version": "13.1.0",
14968 "resolved": "https://registry.npmjs.org/electron/-/electron-13.0.1.tgz", 14968 "resolved": "https://registry.npmjs.org/electron/-/electron-13.1.0.tgz",
14969 "integrity": "sha512-ds1cf0m46nStil0jbM2r9W/p+Kprdq22+2MikIUqEu69eGl1c86IinQVrpmJ9bR4RshDSF4j3uD32a0bsHDMnQ==", 14969 "integrity": "sha512-ykRAaPWrVQkm2Lju4O4rMQzahNcxWLeLMrhBw8WnmIiugkvUH0MhZ85jsOTrAoQ2Zl1FC542bloKFWGSkeVjkg==",
14970 "dev": true, 14970 "dev": true,
14971 "requires": { 14971 "requires": {
14972 "@electron/get": "^1.0.1", 14972 "@electron/get": "^1.0.1",
@@ -14975,9 +14975,9 @@
14975 }, 14975 },
14976 "dependencies": { 14976 "dependencies": {
14977 "@types/node": { 14977 "@types/node": {
14978 "version": "14.17.1", 14978 "version": "14.17.2",
14979 "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz", 14979 "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.2.tgz",
14980 "integrity": "sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw==", 14980 "integrity": "sha512-sld7b/xmFum66AAKuz/rp/CUO8+98fMpyQ3SBfzzBNGMd/1iHBTAg9oyAvcYlAj46bpc74r91jSw2iFdnx29nw==",
14981 "dev": true 14981 "dev": true
14982 } 14982 }
14983 } 14983 }
@@ -19643,9 +19643,9 @@
19643 }, 19643 },
19644 "dependencies": { 19644 "dependencies": {
19645 "core-js": { 19645 "core-js": {
19646 "version": "3.13.0", 19646 "version": "3.13.1",
19647 "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.13.0.tgz", 19647 "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.13.1.tgz",
19648 "integrity": "sha512-iWDbiyha1M5vFwPFmQnvRv+tJzGbFAm6XimJUT0NgHYW3xZEs1SkCAcasWSVFxpI2Xb/V1DDJckq3v90+bQnog==", 19648 "integrity": "sha512-JqveUc4igkqwStL2RTRn/EPFGBOfEZHxJl/8ej1mXJR75V3go2mFF4bmUYkEIT1rveHKnkUlcJX/c+f1TyIovQ==",
19649 "dev": true, 19649 "dev": true,
19650 "optional": true 19650 "optional": true
19651 }, 19651 },
@@ -27931,9 +27931,9 @@
27931 } 27931 }
27932 }, 27932 },
27933 "node-abi": { 27933 "node-abi": {
27934 "version": "2.26.0", 27934 "version": "2.30.0",
27935 "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.26.0.tgz", 27935 "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz",
27936 "integrity": "sha512-ag/Vos/mXXpWLLAYWsAoQdgS+gW7IwvgMLOgqopm/DbzAjazLltzgzpVMsFlgmo9TzG5hGXeaBZx2AI731RIsQ==", 27936 "integrity": "sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==",
27937 "dev": true, 27937 "dev": true,
27938 "requires": { 27938 "requires": {
27939 "semver": "^5.4.1" 27939 "semver": "^5.4.1"
diff --git a/package.json b/package.json
index 6082dd65..a938a667 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
137 }, 137 },
138 "devDependencies": { 138 "devDependencies": {
139 "@adlk/misty": "^0.2.0", 139 "@adlk/misty": "^0.2.0",
140 "@babel/cli": "^7.13.16", 140 "@babel/cli": "7.14.3",
141 "@babel/core": "7.14.2", 141 "@babel/core": "7.14.2",
142 "@babel/plugin-proposal-class-properties": "^7.13.0", 142 "@babel/plugin-proposal-class-properties": "^7.13.0",
143 "@babel/plugin-proposal-decorators": "7.14.2", 143 "@babel/plugin-proposal-decorators": "7.14.2",
@@ -148,7 +148,7 @@
148 "@babel/preset-env": "7.14.2", 148 "@babel/preset-env": "7.14.2",
149 "@babel/preset-react": "7.13.13", 149 "@babel/preset-react": "7.13.13",
150 "@babel/register": "^7.13.16", 150 "@babel/register": "^7.13.16",
151 "@types/classnames": "^2.2.9", 151 "@types/classnames": "2.2.9",
152 "@types/color": "^3.0.1", 152 "@types/color": "^3.0.1",
153 "@types/color-convert": "^1.9.0", 153 "@types/color-convert": "^1.9.0",
154 "@types/fs-extra": "^7.0.0", 154 "@types/fs-extra": "^7.0.0",
@@ -167,7 +167,7 @@
167 "cross-env": "^5.0.5", 167 "cross-env": "^5.0.5",
168 "cz-conventional-changelog": "^2.1.0", 168 "cz-conventional-changelog": "^2.1.0",
169 "dotenv": "8.6.0", 169 "dotenv": "8.6.0",
170 "electron": "13.0.1", 170 "electron": "13.1.0",
171 "electron-builder": "22.11.3", 171 "electron-builder": "22.11.3",
172 "electron-notarize": "1.0.0", 172 "electron-notarize": "1.0.0",
173 "electron-rebuild": "2.3.5", 173 "electron-rebuild": "2.3.5",
@@ -193,7 +193,7 @@
193 "lerna": "4.0.0", 193 "lerna": "4.0.0",
194 "mobx-react-devtools": "^6.1.1", 194 "mobx-react-devtools": "^6.1.1",
195 "mocha": "^5.2.0", 195 "mocha": "^5.2.0",
196 "node-abi": "^2.26.0", 196 "node-abi": "2.30.0",
197 "node-sass": "^5.0.0", 197 "node-sass": "^5.0.0",
198 "prettier": "2.3.0", 198 "prettier": "2.3.0",
199 "preval-build-info": "^1.0.3", 199 "preval-build-info": "^1.0.3",
diff --git a/src/components/auth/Pricing.js b/src/components/auth/Pricing.js
index 4f5a76c8..fecc6ba5 100644
--- a/src/components/auth/Pricing.js
+++ b/src/components/auth/Pricing.js
@@ -221,7 +221,7 @@ export default @injectSheet(styles) @observer class Signup extends Component {
221 <p className={classnames(classes.price, classes.trialPrice)}> 221 <p className={classnames(classes.price, classes.trialPrice)}>
222 <span className={classes.figure}> 222 <span className={classes.figure}>
223 {currency} 223 {currency}
224 0 224 0
225 </span> 225 </span>
226 <sup>00</sup> 226 <sup>00</sup>
227 </p> 227 </p>
diff --git a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
index 37ccc8e5..36e0ac41 100644
--- a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
+++ b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
@@ -61,7 +61,7 @@ export default @injectSheet(styles) @observer class WebviewErrorHandler extends
61 <p> 61 <p>
62 <strong> 62 <strong>
63 {intl.formatMessage(messages.errorMessage)} 63 {intl.formatMessage(messages.errorMessage)}
64: 64 :
65 </strong> 65 </strong>
66 {' '} 66 {' '}
67 {errorMessage} 67 {errorMessage}
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index d4714a80..5c3149a1 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -214,7 +214,7 @@ const styles = {
214 && service.unreadDirectMessageCount === 0 214 && service.unreadDirectMessageCount === 0
215 && service.isIndirectMessageBadgeEnabled && ( 215 && service.isIndirectMessageBadgeEnabled && (
216 <span className="tab-item__message-count is-indirect"> 216 <span className="tab-item__message-count is-indirect">
217 217
218 </span> 218 </span>
219 )} 219 )}
220 {service.isHibernating && !service.isHibernationEnabled && ( 220 {service.isHibernating && !service.isHibernationEnabled && (
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 28f45660..0c036633 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -675,13 +675,13 @@ export default @observer class EditSettingsForm extends Component {
675 <span> 675 <span>
676 676
677 677
678 Ferdi is based on 678 Ferdi is based on
679 {' '} 679 {' '}
680 <a href="https://github.com/meetfranz/franz" target="_blank">Franz</a> 680 <a href="https://github.com/meetfranz/franz" target="_blank">Franz</a>
681 681
682 682
683 , a project published 683 , a project published
684 under the 684 under the
685 {' '} 685 {' '}
686 <a href="https://github.com/meetfranz/franz/blob/master/LICENSE" target="_blank">Apache-2.0 License</a> 686 <a href="https://github.com/meetfranz/franz/blob/master/LICENSE" target="_blank">Apache-2.0 License</a>
687 </span> 687 </span>