paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-11-02 04:53:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge usptream master

Browse Source
This commit is contained in:
simplyahmazing
2017-05-22 19:07:01 -04:00
parent f4567c762d d5a92110db
commit 4a84f17d86
6 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.node-version Normal file
View File

@@ -0,0 +1 @@
6.9.4

1
.python-version Normal file
View File

@@ -0,0 +1 @@
2.7.9

14
README.md
View File

@@ -57,6 +57,20 @@ It will start the packaging process for operating system you are running this co
You can create Windows installer only when running on Windows, the same is true for Linux and OSX. So to generate all three installers you need all three operating systems.
# Download
* [macOS](https://github.com/zulip/zulip-electron/releases/download/v0.5.10/Zulip-0.5.10.dmg)
* Linux:
* [AppImage](https://github.com/zulip/zulip-electron/releases/download/v0.5.10/Zulip-0.5.10-x86_64.AppImage) (Recommended)
Needs to be [made executable](http://discourse.appimage.org/t/how-to-make-an-appimage-executable/80) after download.
* [deb](https://github.com/zulip/zulip-electron/releases/download/v0.5.10/Zulip_0.5.10_amd64.deb)
* Windows:
* [Installer](https://github.com/zulip/zulip-electron/releases/download/v0.5.10/Zulip.Web.Setup.0.5.10.exe)
* Zip
* [64bit](https://github.com/zulip/zulip-electron/releases/download/v0.5.10/zulip-0.5.10-x64.nsis.7z)
* [32bit](https://github.com/zulip/zulip-electron/releases/download/v0.5.10/zulip-0.5.10-ia32.nsis.7z)
## Features

6
app/main/index.js
View File

@@ -117,7 +117,7 @@ function createMainWindow() {
icon: iconPath(),
minWidth: 600,
minHeight: 400,
titleBarStyle: 'hidden-inset',
// titleBarStyle: 'hidden-inset',
webPreferences: {
plugins: true,
allowDisplayingInsecureContent: true,
@@ -234,6 +234,10 @@ app.on('ready', () => {
appUpdater();
}
});
electron.powerMonitor.on('resume', () => {
mainWindow.reload();
mainWindow.webContents.send('destroytray');
});
checkConnection();
ipc.on('reload-main', () => {

16
build/entitlements.mas.plist Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.files.user-selected.read-only</key>
<true/>
<key>com.apple.security.files.user-selected.read-write</key>
<true/>
<key>com.apple.security.files.downloads.read-write</key>
<true/>
</dict>
</plist>

4
package.json
View File

@@ -25,6 +25,7 @@
"dev": "gulp dev",
"pack": "build --dir",
"dist": "build",
"mas": "build --mac mas",
"build:win": "build --win nsis-web --ia32 --x64",
"travis": "cd ./scripts && ./travis-build-test.sh"
},
@@ -45,6 +46,7 @@
"description": "Zulip Desktop Client for Linux",
"target": [
"deb",
"zip",
"AppImage"
],
"maintainer": "Akash Nimare <svnitakash@gmail.com>"
@@ -90,7 +92,7 @@
"devDependencies": {
"assert": "1.4.1",
"devtron": "1.4.0",
"electron-builder": "16.6.0",
"electron-builder": "17.10.0",
"electron": "1.6.8",
"electron-connect": "0.4.8",
"gulp": "3.9.1",