mirror of
https://github.com/zulip/zulip-desktop.git
synced 2025-11-04 22:13:13 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e2286b6110 | ||
|
|
27ba3f3068 | ||
|
|
9859315fea | ||
|
|
73d18dde9e |
@@ -1,27 +1,17 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
// const os = require('os');
|
|
||||||
const {app, dialog} = require('electron');
|
const {app, dialog} = require('electron');
|
||||||
const {autoUpdater} = require('electron-updater');
|
const {autoUpdater} = require('electron-updater');
|
||||||
|
|
||||||
// We don't need to call all of these since it's automatically handled by electron-updater
|
|
||||||
// const version = app.getVersion();
|
|
||||||
// const platform = os.platform() + '_' + os.arch(); // usually returns darwin_64
|
|
||||||
// const updaterFeedURL = 'http://zulipdesktop.herokuapp.com/update/' + platform + '/' + version;
|
|
||||||
|
|
||||||
function appUpdater() {
|
function appUpdater() {
|
||||||
// autoUpdater.setFeedURL(updaterFeedURL);
|
|
||||||
|
|
||||||
// Log whats happening
|
// Log whats happening
|
||||||
const log = require('electron-log');
|
const log = require('electron-log');
|
||||||
log.transports.file.level = 'info';
|
log.transports.file.level = 'info';
|
||||||
autoUpdater.logger = log;
|
autoUpdater.logger = log;
|
||||||
// TODO send autoUpdater events to renderer so that we could
|
|
||||||
// it could console log in developer tools
|
|
||||||
/*
|
/*
|
||||||
autoUpdater.on('error', err => console.log(err));
|
autoUpdater.on('error', err => log.info(err));
|
||||||
autoUpdater.on('checking-for-update', () => console.log('checking-for-update'));
|
autoUpdater.on('checking-for-update', () => log.info('checking-for-update'));
|
||||||
autoUpdater.on('update-available', () => console.log('update-available'));
|
autoUpdater.on('update-available', () => log.info('update-available'));
|
||||||
autoUpdater.on('update-not-available', () => console.log('update-not-available'));
|
autoUpdater.on('update-not-available', () => log.info('update-not-available'));
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Ask the user if update is available
|
// Ask the user if update is available
|
||||||
|
|||||||
@@ -16,12 +16,6 @@ const {appUpdater} = require('./autoupdater');
|
|||||||
const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
|
const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
|
||||||
const data = db.getData('/');
|
const data = db.getData('/');
|
||||||
|
|
||||||
/* Handling squirrel.windows events on windows
|
|
||||||
Update - Not needed for NSIS
|
|
||||||
if (require('electron-squirrel-startup')) {
|
|
||||||
app.quit();
|
|
||||||
} */
|
|
||||||
|
|
||||||
// adds debug features like hotkeys for triggering dev tools and reload
|
// adds debug features like hotkeys for triggering dev tools and reload
|
||||||
require('electron-debug')();
|
require('electron-debug')();
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"name": "zulip",
|
"name": "zulip",
|
||||||
"productName": "Zulip",
|
"productName": "Zulip",
|
||||||
"version": "0.5.7-beta",
|
"version": "0.5.8",
|
||||||
"description": "Zulip Desktop App",
|
"description": "Zulip Desktop App",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"email":"<svnitakash@gmail.com>",
|
"email":"<svnitakash@gmail.com>",
|
||||||
"copyright": "©2016 Kandra Labs, Inc.",
|
"copyright": "©2017 Kandra Labs, Inc.",
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Akash Nimare",
|
"name": "Akash Nimare",
|
||||||
"email": "svnitakash@gmail.com"
|
"email": "svnitakash@gmail.com"
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"electron-is-dev": "0.1.2",
|
"electron-is-dev": "0.1.2",
|
||||||
"electron-updater": "1.4.1",
|
"electron-updater": "1.6.2",
|
||||||
"electron-log": "1.3.0",
|
"electron-log": "1.3.0",
|
||||||
"configstore": "2.1.0",
|
"configstore": "2.1.0",
|
||||||
"dialogs": "1.1.14",
|
"dialogs": "1.1.14",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "zulip",
|
"name": "zulip",
|
||||||
"productName": "Zulip",
|
"productName": "Zulip",
|
||||||
"version": "0.5.7-beta",
|
"version": "0.5.8",
|
||||||
"description": "Zulip Desktop App",
|
"description": "Zulip Desktop App",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"email":"<svnitakash@gmail.com>",
|
"email":"<svnitakash@gmail.com>",
|
||||||
@@ -24,6 +24,7 @@
|
|||||||
"dev": "gulp dev",
|
"dev": "gulp dev",
|
||||||
"pack": "build --dir",
|
"pack": "build --dir",
|
||||||
"dist": "build",
|
"dist": "build",
|
||||||
|
"build:win": "build --win nsis-web --ia32 --x64",
|
||||||
"travis": "cd ./scripts && ./travis-build-test.sh"
|
"travis": "cd ./scripts && ./travis-build-test.sh"
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
@@ -33,7 +34,7 @@
|
|||||||
"**/*",
|
"**/*",
|
||||||
"!node_modules/@paulcbetts/cld/deps/cld${/*}"
|
"!node_modules/@paulcbetts/cld/deps/cld${/*}"
|
||||||
],
|
],
|
||||||
"copyright": "©2016 Kandra Labs, Inc.",
|
"copyright": "©2017 Kandra Labs, Inc.",
|
||||||
"mac": {
|
"mac": {
|
||||||
"category": "public.app-category.productivity"
|
"category": "public.app-category.productivity"
|
||||||
},
|
},
|
||||||
@@ -43,7 +44,7 @@
|
|||||||
"packageCategory": "GNOME;GTK;Network;InstantMessaging",
|
"packageCategory": "GNOME;GTK;Network;InstantMessaging",
|
||||||
"description": "Zulip Desktop Client for Linux",
|
"description": "Zulip Desktop Client for Linux",
|
||||||
"target" : ["deb", "AppImage"],
|
"target" : ["deb", "AppImage"],
|
||||||
"version" : "0.5.7-beta",
|
"version" : "0.5.8",
|
||||||
"title" : "Zulip",
|
"title" : "Zulip",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"maintainer": "Akash Nimare <svnitakash@gmail.com>"
|
"maintainer": "Akash Nimare <svnitakash@gmail.com>"
|
||||||
@@ -87,7 +88,7 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"assert": "^1.4.1",
|
"assert": "^1.4.1",
|
||||||
"devtron": "^1.1.0",
|
"devtron": "^1.1.0",
|
||||||
"electron-builder": "13.0.0",
|
"electron-builder": "13.6.0",
|
||||||
"electron": "1.4.7",
|
"electron": "1.4.7",
|
||||||
"electron-connect": "^0.4.6",
|
"electron-connect": "^0.4.6",
|
||||||
"gulp": "^3.9.1",
|
"gulp": "^3.9.1",
|
||||||
|
|||||||
Reference in New Issue
Block a user