diff options
author | 2019-03-14 15:25:24 +0100 | |
---|---|---|
committer | 2019-03-14 15:25:24 +0100 | |
commit | e2612183e90e6cc9779f615e2ff12a366be32242 (patch) | |
tree | 147a32e6fbd934dd8098196dc8e171a1fa384690 | |
parent | fixes unnecessary scrollbars issue on signup form (diff) | |
parent | Merge branch 'sergiughf-hotfix/update-electron' into develop (diff) | |
download | ferdium-app-e2612183e90e6cc9779f615e2ff12a366be32242.tar.gz ferdium-app-e2612183e90e6cc9779f615e2ff12a366be32242.tar.zst ferdium-app-e2612183e90e6cc9779f615e2ff12a366be32242.zip |
Merge branch 'develop' of https://github.com/meetfranz/franz into develop
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | package-lock.json | 60 | ||||
-rw-r--r-- | package.json | 2 |
3 files changed, 51 insertions, 13 deletions
@@ -16,7 +16,7 @@ Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many mor | |||
16 | 16 | ||
17 | `$ brew cask install franz` | 17 | `$ brew cask install franz` |
18 | 18 | ||
19 | (Don't know homebrew? [brew.sh](https://brew.sh/) | 19 | (Don't know homebrew? [brew.sh](https://brew.sh/)) |
20 | 20 | ||
21 | ## Development | 21 | ## Development |
22 | 22 | ||
diff --git a/package-lock.json b/package-lock.json index 8499abda9..a9724bb82 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -2358,7 +2358,8 @@ | |||
2358 | "abbrev": { | 2358 | "abbrev": { |
2359 | "version": "1.1.1", | 2359 | "version": "1.1.1", |
2360 | "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", | 2360 | "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", |
2361 | "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" | 2361 | "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", |
2362 | "dev": true | ||
2362 | }, | 2363 | }, |
2363 | "accepts": { | 2364 | "accepts": { |
2364 | "version": "1.0.7", | 2365 | "version": "1.0.7", |
@@ -2628,7 +2629,8 @@ | |||
2628 | "aproba": { | 2629 | "aproba": { |
2629 | "version": "1.2.0", | 2630 | "version": "1.2.0", |
2630 | "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", | 2631 | "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", |
2631 | "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" | 2632 | "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", |
2633 | "dev": true | ||
2632 | }, | 2634 | }, |
2633 | "archy": { | 2635 | "archy": { |
2634 | "version": "1.0.0", | 2636 | "version": "1.0.0", |
@@ -2640,6 +2642,7 @@ | |||
2640 | "version": "1.1.5", | 2642 | "version": "1.1.5", |
2641 | "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", | 2643 | "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", |
2642 | "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", | 2644 | "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", |
2645 | "dev": true, | ||
2643 | "requires": { | 2646 | "requires": { |
2644 | "delegates": "^1.0.0", | 2647 | "delegates": "^1.0.0", |
2645 | "readable-stream": "^2.0.6" | 2648 | "readable-stream": "^2.0.6" |
@@ -2649,6 +2652,7 @@ | |||
2649 | "version": "2.3.6", | 2652 | "version": "2.3.6", |
2650 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | 2653 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", |
2651 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", | 2654 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", |
2655 | "dev": true, | ||
2652 | "requires": { | 2656 | "requires": { |
2653 | "core-util-is": "~1.0.0", | 2657 | "core-util-is": "~1.0.0", |
2654 | "inherits": "~2.0.3", | 2658 | "inherits": "~2.0.3", |
@@ -2663,6 +2667,7 @@ | |||
2663 | "version": "1.1.1", | 2667 | "version": "1.1.1", |
2664 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", | 2668 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", |
2665 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", | 2669 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", |
2670 | "dev": true, | ||
2666 | "requires": { | 2671 | "requires": { |
2667 | "safe-buffer": "~5.1.0" | 2672 | "safe-buffer": "~5.1.0" |
2668 | } | 2673 | } |
@@ -5428,7 +5433,8 @@ | |||
5428 | "delegates": { | 5433 | "delegates": { |
5429 | "version": "1.0.0", | 5434 | "version": "1.0.0", |
5430 | "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", | 5435 | "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", |
5431 | "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" | 5436 | "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", |
5437 | "dev": true | ||
5432 | }, | 5438 | }, |
5433 | "depd": { | 5439 | "depd": { |
5434 | "version": "0.4.4", | 5440 | "version": "0.4.4", |
@@ -5668,6 +5674,29 @@ | |||
5668 | "readable-stream": "~1.1.9" | 5674 | "readable-stream": "~1.1.9" |
5669 | }, | 5675 | }, |
5670 | "dependencies": { | 5676 | "dependencies": { |
5677 | "abbrev": { | ||
5678 | "version": "1.1.1", | ||
5679 | "resolved": false, | ||
5680 | "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" | ||
5681 | }, | ||
5682 | "ansi-regex": { | ||
5683 | "version": "2.1.1", | ||
5684 | "resolved": false, | ||
5685 | "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" | ||
5686 | }, | ||
5687 | "aproba": { | ||
5688 | "version": "1.2.0", | ||
5689 | "resolved": false, | ||
5690 | "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" | ||
5691 | }, | ||
5692 | "are-we-there-yet": { | ||
5693 | "version": "1.1.4", | ||
5694 | "resolved": false, | ||
5695 | "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", | ||
5696 | "requires": { | ||
5697 | "delegates": "^1.0.0" | ||
5698 | } | ||
5699 | }, | ||
5671 | "balanced-match": { | 5700 | "balanced-match": { |
5672 | "version": "1.0.0", | 5701 | "version": "1.0.0", |
5673 | "resolved": false, | 5702 | "resolved": false, |
@@ -5984,6 +6013,11 @@ | |||
5984 | "glob": "^7.0.5" | 6013 | "glob": "^7.0.5" |
5985 | } | 6014 | } |
5986 | }, | 6015 | }, |
6016 | "safe-buffer": { | ||
6017 | "version": "5.1.1", | ||
6018 | "resolved": false, | ||
6019 | "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" | ||
6020 | }, | ||
5987 | "safer-buffer": { | 6021 | "safer-buffer": { |
5988 | "version": "2.1.2", | 6022 | "version": "2.1.2", |
5989 | "resolved": false, | 6023 | "resolved": false, |
@@ -6028,7 +6062,10 @@ | |||
6028 | "strip-ansi": { | 6062 | "strip-ansi": { |
6029 | "version": "3.0.1", | 6063 | "version": "3.0.1", |
6030 | "resolved": false, | 6064 | "resolved": false, |
6031 | "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=" | 6065 | "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", |
6066 | "requires": { | ||
6067 | "ansi-regex": "^2.0.0" | ||
6068 | } | ||
6032 | }, | 6069 | }, |
6033 | "strip-json-comments": { | 6070 | "strip-json-comments": { |
6034 | "version": "2.0.1", | 6071 | "version": "2.0.1", |
@@ -6154,9 +6191,9 @@ | |||
6154 | "dev": true | 6191 | "dev": true |
6155 | }, | 6192 | }, |
6156 | "electron": { | 6193 | "electron": { |
6157 | "version": "4.0.7", | 6194 | "version": "4.0.8", |
6158 | "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.7.tgz", | 6195 | "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.8.tgz", |
6159 | "integrity": "sha512-KYQ9SJZFWNKqoq6XjKW1bLFHjmAGeSC3XNuhHK/Sd2MK5H5sO3iKjvZU/YhiBUtkB/cBSkOdQTVEaLcMwU8l3A==", | 6196 | "integrity": "sha512-FOBJIHkuv8wc15N+ZyqwDzPavYVu5CHMBEf14jHDWv7QW2vkEIpJjVK+PIT31kfZfvjsIP0j2wvA/FBsiqB7pw==", |
6160 | "dev": true, | 6197 | "dev": true, |
6161 | "requires": { | 6198 | "requires": { |
6162 | "@types/node": "^10.12.18", | 6199 | "@types/node": "^10.12.18", |
@@ -6165,9 +6202,9 @@ | |||
6165 | }, | 6202 | }, |
6166 | "dependencies": { | 6203 | "dependencies": { |
6167 | "@types/node": { | 6204 | "@types/node": { |
6168 | "version": "10.12.29", | 6205 | "version": "10.12.30", |
6169 | "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.29.tgz", | 6206 | "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz", |
6170 | "integrity": "sha512-J/tnbnj8HcsBgCe2apZbdUpQ7hs4d7oZNTYA5bekWdP0sr2NGsOpI/HRdDroEi209tEvTcTtxhD0FfED3DhEcw==", | 6207 | "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==", |
6171 | "dev": true | 6208 | "dev": true |
6172 | } | 6209 | } |
6173 | } | 6210 | } |
@@ -14566,7 +14603,8 @@ | |||
14566 | "process-nextick-args": { | 14603 | "process-nextick-args": { |
14567 | "version": "2.0.0", | 14604 | "version": "2.0.0", |
14568 | "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", | 14605 | "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", |
14569 | "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" | 14606 | "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", |
14607 | "dev": true | ||
14570 | }, | 14608 | }, |
14571 | "progress": { | 14609 | "progress": { |
14572 | "version": "2.0.3", | 14610 | "version": "2.0.3", |
diff --git a/package.json b/package.json index 14e0df7ca..df7fa4191 100644 --- a/package.json +++ b/package.json | |||
@@ -113,7 +113,7 @@ | |||
113 | "cross-env": "^5.0.5", | 113 | "cross-env": "^5.0.5", |
114 | "cz-conventional-changelog": "2.1.0", | 114 | "cz-conventional-changelog": "2.1.0", |
115 | "dotenv": "^4.0.0", | 115 | "dotenv": "^4.0.0", |
116 | "electron": "4.0.7", | 116 | "electron": "4.0.8", |
117 | "electron-builder": "20.38.4", | 117 | "electron-builder": "20.38.4", |
118 | "electron-rebuild": "1.8.4", | 118 | "electron-rebuild": "1.8.4", |
119 | "eslint": "5.10.0", | 119 | "eslint": "5.10.0", |