Skip to content

Commit 609b90b

Browse files
committed
v5.9.6
1 parent f499c9f commit 609b90b

File tree

7 files changed

+32
-19
lines changed

7 files changed

+32
-19
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ platform:
55

66
branches:
77
only:
8-
- release
8+
- master
99

1010
version: '{build}-{branch}'
1111

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ language: c
1212

1313
branches:
1414
only:
15-
- release
15+
- master
1616

1717
cache:
1818
directories:

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
<p align="center">
44
<b>PB for Desktop</b> is a <b>lightweight</b> open-source <b>Desktop app</b> for <b><a href="https://pushbullet.com/">PushBullet</a></b>.<br>
55
Receive native push notifications on macOS, Windows and Linux.</b><br><br>
6-
<img height="200px" src="https://raw.githubusercontent.com/sidneys/pb-for-desktop/release/resources/graphics/icon.png"/><br><br>
6+
<img height="200px" src="https://raw.githubusercontent.com/sidneys/pb-for-desktop/master/resources/graphics/icon.png"/><br><br>
77
<i>Not affiliated with PushBullet Incorporated.</i><br><br>
88
</p>
99

1010

1111
------
1212

13-
![Screenshot: Pushbullet for Desktop (macOS)](https://raw.githubusercontent.com/sidneys/pb-for-desktop/release/resources/screenshots/screenshot-macos.png)
13+
![Screenshot: Pushbullet for Desktop (macOS)](https://raw.githubusercontent.com/sidneys/pb-for-desktop/master/resources/screenshots/screenshot-macos.png)
1414

15-
![Screenshot: Pushbullet for Desktop (Windows)](https://raw.githubusercontent.com/sidneys/pb-for-desktop/release/resources/screenshots/screenshot-win32.png)
15+
![Screenshot: Pushbullet for Desktop (Windows)](https://raw.githubusercontent.com/sidneys/pb-for-desktop/master/resources/screenshots/screenshot-win32.png)
1616

17-
![Screenshot: Pushbullet for Desktop (Linux)](https://raw.githubusercontent.com/sidneys/pb-for-desktop/release/resources/screenshots/screenshot-linux.png)
17+
![Screenshot: Pushbullet for Desktop (Linux)](https://raw.githubusercontent.com/sidneys/pb-for-desktop/master/resources/screenshots/screenshot-linux.png)
1818

1919
------
2020

@@ -78,7 +78,7 @@ Use tags to add emoji to notifications, e.g.: add `{video}` to show a 📺 with
7878

7979
### Standard Installation
8080

81-
Download the latest version of PB for Desktop on the [Releases](https://github.com/sidneys/pb-for-desktop/releases) page.
81+
Download the latest version of PB for Desktop on the [Releases](https://github.com/sidneys/pb-for-desktop/masters) page.
8282

8383
### Installation as Commandline Tool
8484

@@ -179,7 +179,7 @@ sudo apt-get install wine mono fakeroot dpkg
179179
> Turnkey **build-in-the-cloud** integration.
180180
181181
The CI deployment is managed by a custom layer of node scripts and Electron-optimized configuration templates.
182-
Completed Installation packages are deployed to [GitHub Releases](https://github.com/sidneys/pb-for-desktop/releases). Builds for all platforms and architectures take about 5 minutes.
182+
Completed Installation packages are deployed to [GitHub Releases](https://github.com/sidneys/pb-for-desktop/masters). Builds for all platforms and architectures take about 5 minutes.
183183
Backed by the open-source-friendly guys at [Travis](http://travis-ci.org/) and AppVeyor](https://ci.appveyor.com/) and running [electron-packager](https://github.com/electron-userland/electron-packager) under the hood.
184184

185185
### Setup
@@ -218,7 +218,7 @@ Backed by the open-source-friendly guys at [Travis](http://travis-ci.org/) and A
218218

219219
## <a name="contribute"/></a> Contact ![Contributions Wanted](https://img.shields.io/badge/contributions-wanted-red.svg?style=flat-square)
220220

221-
Read the [contribution documentation](https://github.com/sidneys/pb-for-desktop/blob/release/CONTRIBUTING.md) first.
221+
Read the [contribution documentation](https://github.com/sidneys/pb-for-desktop/blob/master/CONTRIBUTING.md) first.
222222

223223
- [Dev Chat](http://gitter.im/sidneys/pb-for-desktop): Talk about features and suggestions.
224224
- [Issues](http;//github.com/sidneys/pb-for-desktop/issues) File bugs and document issues.

RELEASENOTES.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
{
2+
"5.9.6": {
3+
"👷 internals": [
4+
"Upgrades Electron to v1.7.2",
5+
"Upgrades dependencies"
6+
]
7+
},
28
"5.9.4": {
39
"🚨 bugfixes": [
410
"Addresses reset of badge counter (macOS)"

RELEASENOTES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 5.9.6
2+
3+
#### 👷 Internals
4+
5+
- Upgrades Electron to v1.7.2
6+
- Upgrades dependencies
7+
18
## 5.9.4
29

310
#### 🚨 Bugfixes

app/styles/styles.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
:root {
1111
--margin-titlebar: 20px;
12-
--color-titlebar: #4ab367;
12+
--color-green: #4ab367;
1313
--z-index-top: 1337;
1414
--z-index-topmost: 13370;
1515
}
@@ -68,6 +68,7 @@ webview {
6868
flex-direction: row;
6969
flex: 1;
7070
justify-content: space-between;
71+
background-color: var(--color-green);
7172
}
7273

7374
html.darwin webview {
@@ -351,7 +352,7 @@ html:not('.darwin') .titlebar {
351352
}
352353

353354
.titlebar.top {
354-
background-color: var(--color-titlebar);
355+
background-color: var(--color-green);
355356
left: 0;
356357
right: 0;
357358
height: var(--margin-titlebar);

package.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "pb-for-desktop",
33
"productName": "PB for Desktop",
4-
"version": "5.9.4",
4+
"version": "5.9.6",
55
"description": "Pushbullet Desktop app for macOS, Windows and Linux.",
66
"license": "MIT",
77
"homepage": "https://sidneys.github.io/pb-for-desktop",
@@ -53,7 +53,7 @@
5353
"chalkline": "0.0.5",
5454
"electron-editor-context-menu": "^1.1.1",
5555
"electron-settings": "^3.0.14",
56-
"electron-updater": "^1.15.0",
56+
"electron-updater": "^1.16.0",
5757
"file-type": "^4.3.0",
5858
"file-url": "^2.0.2",
5959
"fs-extra": "^3.0.1",
@@ -72,13 +72,13 @@
7272
"try-require": "latest"
7373
},
7474
"devDependencies": {
75-
"electron": "^1.7.1",
76-
"electron-builder": "^17.8.0",
75+
"electron": "^1.7.2",
76+
"electron-builder": "^18.3.5",
7777
"electron-connect": "^0.6.1",
7878
"electron-prebuilt-compile": "^1.7.1",
79-
"fkill": "^4.1.0",
80-
"git-branch": "^0.3.0",
81-
"glob": "^7.1.1",
79+
"fkill": "^5.0.0",
80+
"git-branch": "^1.0.0",
81+
"glob": "^7.1.2",
8282
"gulp": "^3.9.1",
8383
"gulp-load-plugins": "^1.5.0",
8484
"hash-files": "^1.1.1",
@@ -150,7 +150,6 @@
150150
"installerHeaderIcon": "./icons/win32/icon.ico",
151151
"installerIcon": "./icons/win32/icon-setup.ico",
152152
"installerSidebar": "./icons/win32/background-setup.bmp",
153-
"menuCategory": "Pushbullet",
154153
"oneClick": false,
155154
"runAfterFinish": false
156155
}

0 commit comments

Comments
 (0)