diff options
author | Amine <amine@mouafik.fr> | 2020-04-27 09:10:52 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-27 09:10:52 +0000 |
commit | e7a52371b495b9929aa668b95af3e4f494caa26f (patch) | |
tree | fc19ee54231cc3e232ee4bee6df5cd1ab8aee0a4 | |
parent | New Crowdin translations (#632) (diff) | |
download | ferdium-app-e7a52371b495b9929aa668b95af3e4f494caa26f.tar.gz ferdium-app-e7a52371b495b9929aa668b95af3e4f494caa26f.tar.zst ferdium-app-e7a52371b495b9929aa668b95af3e4f494caa26f.zip |
Merge 5.5.0 release branch iterations back into develop (#653)
-rw-r--r-- | CHANGELOG.md | 9 | ||||
-rw-r--r-- | build-helpers/notarize.js | 3 | ||||
-rw-r--r-- | electron-builder.yml | 1 | ||||
-rw-r--r-- | package-lock.json | 2 | ||||
-rw-r--r-- | package.json | 2 | ||||
m--------- | recipes | 0 |
6 files changed, 10 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5086fb3b0..3e573ea76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -1,4 +1,4 @@ | |||
1 | # [5.5.0](https://github.com/getferdi/ferdi/compare/v5.4.4-beta.3...v5.5.0) (2020-04-17) | 1 | # [5.5.0](https://github.com/getferdi/ferdi/compare/v5.4.3...v5.5.0) (2020-04-26) |
2 | ### Features | 2 | ### Features |
3 | - Merge Franz 5.5.0-beta.2 | 3 | - Merge Franz 5.5.0-beta.2 |
4 | - Add dropdown list to choose Todo service (#418, #477), 💖 @yourcontact | 4 | - Add dropdown list to choose Todo service (#418, #477), 💖 @yourcontact |
@@ -65,12 +65,15 @@ | |||
65 | - Fix Dark Reader blocking services from loading (#285) | 65 | - Fix Dark Reader blocking services from loading (#285) |
66 | - Fix incorrect body closing tag (#330), 💖 @jereksel | 66 | - Fix incorrect body closing tag (#330), 💖 @jereksel |
67 | - Fix DarkReader translation problem (#593) | 67 | - Fix DarkReader translation problem (#593) |
68 | - Fix system tray icon tooltip text (#648), 💖 @sampathBlam | ||
69 | - Enable Dark Reader settings to follow the accent color (#646), 💖 @sampathBlam | ||
68 | 70 | ||
69 | ### Build changes | 71 | ### Build changes |
70 | - Add retry commands to flaky build steps (#498) | 72 | - Add retry commands to flaky build steps (#498) |
71 | - Run utility scripts pre-commit instead of pre-push (#515) | 73 | - Run utility scripts pre-commit instead of pre-push (#515) |
74 | - Sign Windows binaries (#635, #633, #112) | ||
72 | 75 | ||
73 | # [5.5.0-gm.2](https://github.com/getferdi/ferdi/compare/v5.5.0-gm...v5.5.0-gm.2) (2020-04-22) | 76 | # [5.5.0-gm.2](https://github.com/getferdi/ferdi/compare/v5.5.0-gm...v5.5.0-gm.2) (2020-04-23) |
74 | ### Features | 77 | ### Features |
75 | - Differentiate between indirect and direct notifications (#590), 💖 @Room4O4 @mahadevans87 @FeikoJoosten @sampathBlam | 78 | - Differentiate between indirect and direct notifications (#590), 💖 @Room4O4 @mahadevans87 @FeikoJoosten @sampathBlam |
76 | - Add setting to keep service in hibernation after startup (#577, #584) | 79 | - Add setting to keep service in hibernation after startup (#577, #584) |
@@ -93,7 +96,7 @@ | |||
93 | ### Bug Fixes | 96 | ### Bug Fixes |
94 | - Fix DarkReader translation problem (#593) | 97 | - Fix DarkReader translation problem (#593) |
95 | 98 | ||
96 | ## [5.5.0-gm](https://github.com/getferdi/ferdi/compare/v5.4.4-beta.3...v5.5.0-gm) (2020-04-15) | 99 | ## [5.5.0-gm](https://github.com/getferdi/ferdi/compare/v5.4.4-beta.3...v5.5.0-gm) (2020-04-19) |
97 | ### Features | 100 | ### Features |
98 | - Merge Franz 5.5.0-beta.2 | 101 | - Merge Franz 5.5.0-beta.2 |
99 | - Add dropdown list to choose Todo service (#418, #477), 💖 @yourcontact | 102 | - Add dropdown list to choose Todo service (#418, #477), 💖 @yourcontact |
diff --git a/build-helpers/notarize.js b/build-helpers/notarize.js index 26a627bea..fc463f749 100644 --- a/build-helpers/notarize.js +++ b/build-helpers/notarize.js | |||
@@ -2,8 +2,7 @@ const { notarize } = require("electron-notarize"); | |||
2 | 2 | ||
3 | exports.default = async function notarizing(context) { | 3 | exports.default = async function notarizing(context) { |
4 | const { electronPlatformName, appOutDir } = context; | 4 | const { electronPlatformName, appOutDir } = context; |
5 | const isTagBuild = process.env.TRAVIS_TAG; | 5 | if (electronPlatformName !== "darwin" || process.env.TRAVIS_BRANCH !== 'release') { |
6 | if (electronPlatformName !== "darwin" || !isTagBuild) { | ||
7 | return; | 6 | return; |
8 | } | 7 | } |
9 | 8 | ||
diff --git a/electron-builder.yml b/electron-builder.yml index 330fc64e1..86349ba6b 100644 --- a/electron-builder.yml +++ b/electron-builder.yml | |||
@@ -37,6 +37,7 @@ win: | |||
37 | arch: [x64, ia32] | 37 | arch: [x64, ia32] |
38 | - target: portable | 38 | - target: portable |
39 | arch: [x64, ia32] | 39 | arch: [x64, ia32] |
40 | publisherName: 'Amine Mouafik' | ||
40 | 41 | ||
41 | linux: | 42 | linux: |
42 | icon: ./build-helpers/images/icons | 43 | icon: ./build-helpers/images/icons |
diff --git a/package-lock.json b/package-lock.json index f117141f5..65294a3a6 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "ferdi", | 2 | "name": "ferdi", |
3 | "version": "5.5.0-gm.2", | 3 | "version": "5.5.0", |
4 | "lockfileVersion": 1, | 4 | "lockfileVersion": 1, |
5 | "requires": true, | 5 | "requires": true, |
6 | "dependencies": { | 6 | "dependencies": { |
diff --git a/package.json b/package.json index b97312e3d..01b902bc0 100644 --- a/package.json +++ b/package.json | |||
@@ -2,7 +2,7 @@ | |||
2 | "name": "ferdi", | 2 | "name": "ferdi", |
3 | "productName": "Ferdi", | 3 | "productName": "Ferdi", |
4 | "appId": "com.kytwb.ferdi", | 4 | "appId": "com.kytwb.ferdi", |
5 | "version": "5.5.0-gm.2", | 5 | "version": "5.5.0", |
6 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", | 6 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", |
7 | "copyright": "kytwb", | 7 | "copyright": "kytwb", |
8 | "main": "index.js", | 8 | "main": "index.js", |
diff --git a/recipes b/recipes | |||
Subproject 911d1ded846165a4b420efa2b58668ad27c9f2c | Subproject 3054fd4c362b5be81b5cdd48535a0e7078fcd0a | ||