diff options
-rw-r--r-- | .travis.yml | 6 | ||||
-rw-r--r-- | package-lock.json | 2 | ||||
-rw-r--r-- | package.json | 2 | ||||
m--------- | recipes | 0 | ||||
-rw-r--r-- | src/electron/ipc-api/appIndicator.js | 1 | ||||
-rw-r--r-- | src/index.js | 1 |
6 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 56fc094e4..501c3480c 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -31,7 +31,7 @@ before_install: | |||
31 | if [ $TRAVIS_BRANCH == "nightly" ]; then | 31 | if [ $TRAVIS_BRANCH == "nightly" ]; then |
32 | git remote add source https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 | 32 | git remote add source https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 |
33 | git fetch source | 33 | git fetch source |
34 | git merge --no-ff --commit --no-edit source/develop | 34 | git merge --no-ff --commit -m "Merge remote-tracking branch 'source/develop' into HEAD [skip ci]" source/develop |
35 | CHANGES_COUNT=$(git diff --stat HEAD origin/nightly | wc -l) | 35 | CHANGES_COUNT=$(git diff --stat HEAD origin/nightly | wc -l) |
36 | echo $TRAVIS_EVENT_TYPE | 36 | echo $TRAVIS_EVENT_TYPE |
37 | echo $changes | 37 | echo $changes |
@@ -40,7 +40,7 @@ before_install: | |||
40 | else | 40 | else |
41 | git submodule update --remote --force | 41 | git submodule update --remote --force |
42 | git add . | 42 | git add . |
43 | git diff-index --quiet HEAD || git commit -m "Update submodules" | 43 | git commit -m "Update submodules [skip ci]" || true |
44 | fi | 44 | fi |
45 | fi | 45 | fi |
46 | install: | 46 | install: |
@@ -57,6 +57,8 @@ script: | |||
57 | fi | 57 | fi |
58 | - | | 58 | - | |
59 | if [ $TRAVIS_BRANCH == "nightly" ]; then | 59 | if [ $TRAVIS_BRANCH == "nightly" ]; then |
60 | git add . | ||
61 | git commit -m "Apply linter fixes [skip ci]" | ||
60 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" | 62 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" |
61 | echo "Building..." | 63 | echo "Building..." |
62 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies | 64 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies |
diff --git a/package-lock.json b/package-lock.json index 20dbebbef..ed333d800 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "ferdi", | 2 | "name": "ferdi", |
3 | "version": "5.6.0-nightly.1", | 3 | "version": "5.6.0-nightly.11", |
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 93e68bbbc..072aa11e6 100644 --- a/package.json +++ b/package.json | |||
@@ -3,7 +3,7 @@ | |||
3 | "productName": "Ferdi", | 3 | "productName": "Ferdi", |
4 | "desktopName": "ferdi.desktop", | 4 | "desktopName": "ferdi.desktop", |
5 | "appId": "com.kytwb.ferdi", | 5 | "appId": "com.kytwb.ferdi", |
6 | "version": "5.6.0-nightly.1", | 6 | "version": "5.6.0-nightly.11", |
7 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", | 7 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", |
8 | "copyright": "kytwb", | 8 | "copyright": "kytwb", |
9 | "main": "index.js", | 9 | "main": "index.js", |
diff --git a/recipes b/recipes | |||
Subproject 5c2f5bdb4edca04d8466c94091c232655ba089f | Subproject b7bfaff13d55e686ea65c89ba57c117703b5d4c | ||
diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.js index bea8e7751..70f14d95e 100644 --- a/src/electron/ipc-api/appIndicator.js +++ b/src/electron/ipc-api/appIndicator.js | |||
@@ -25,7 +25,6 @@ export default (params) => { | |||
25 | }); | 25 | }); |
26 | 26 | ||
27 | ipcMain.on('updateAppIndicator', (event, args) => { | 27 | ipcMain.on('updateAppIndicator', (event, args) => { |
28 | |||
29 | // Flash TaskBar for windows, bounce Dock on Mac | 28 | // Flash TaskBar for windows, bounce Dock on Mac |
30 | if (!app.mainWindow.isFocused()) { | 29 | if (!app.mainWindow.isFocused()) { |
31 | if (params.settings.app.get('notifyTaskBarOnMessage')) { | 30 | if (params.settings.app.get('notifyTaskBarOnMessage')) { |
diff --git a/src/index.js b/src/index.js index 928a9744e..b5d08ea76 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -61,7 +61,6 @@ if (isWindows) { | |||
61 | } | 61 | } |
62 | 62 | ||
63 | 63 | ||
64 | |||
65 | // Globally set useragent to fix user agent override in service workers | 64 | // Globally set useragent to fix user agent override in service workers |
66 | debug('Set userAgent to ', userAgent()); | 65 | debug('Set userAgent to ', userAgent()); |
67 | app.userAgentFallback = userAgent(); | 66 | app.userAgentFallback = userAgent(); |