Skip to content
This repository has been archived by the owner on Feb 21, 2020. It is now read-only.

Update electron, react, modules + fixes #33

Merged
merged 56 commits into from
Nov 2, 2016
Merged
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
e47e9c3
update bluebird
vankasteelj Oct 28, 2016
348b65d
update bugsnag-js
vankasteelj Oct 28, 2016
293f8ef
update non-critical modules
vankasteelj Oct 28, 2016
1a3137d
update alt
vankasteelj Oct 28, 2016
c8e04c8
remove unused module 'validator'
vankasteelj Oct 28, 2016
42bc1ab
update lodash
vankasteelj Oct 28, 2016
44c9969
update jquery
vankasteelj Oct 28, 2016
b5db59a
update winreg
vankasteelj Oct 28, 2016
436a0cc
update get-port
vankasteelj Oct 28, 2016
ed67f50
update is-running
vankasteelj Oct 28, 2016
92f80fb
remove unused module 'node-cache'
vankasteelj Oct 28, 2016
5d2c9e1
update dev dependencies
vankasteelj Oct 28, 2016
12f0535
revert back to babel 5.x for now
vankasteelj Oct 28, 2016
36c8e05
bump to electron 1.x
vankasteelj Oct 28, 2016
609ade2
app.terminate() is deprecated, using process.exit(0)
vankasteelj Oct 29, 2016
d767c20
update Util.exec() for node > 6
vankasteelj Oct 29, 2016
e6a060b
comment Header.react.js -> autoUpdater
vankasteelj Oct 29, 2016
aaa92cf
remove unused font-smoothing vendor prefixes
vankasteelj Oct 29, 2016
3091c4d
remove autoUpdater refs, turns out it wasn't used
vankasteelj Oct 29, 2016
f394a86
better import & require syntax usage
vankasteelj Oct 29, 2016
71d7d35
fix requiring powerMonitor too early
vankasteelj Oct 29, 2016
201ef69
update to react 0.14
vankasteelj Oct 29, 2016
58182af
use cmd+I to open 'about' page
vankasteelj Oct 29, 2016
daa6fc8
update to react 15.x
vankasteelj Oct 29, 2016
53977fd
remove deprecated LinkedStateMixin
vankasteelj Oct 29, 2016
37014cc
use native Promise
vankasteelj Oct 29, 2016
481b3ad
fix react-select
vankasteelj Oct 29, 2016
cc1f37d
user-friendly log
vankasteelj Oct 29, 2016
05aeac1
clear object-assign node-module
vankasteelj Oct 30, 2016
0813831
correctly log chosen server while connecting
vankasteelj Oct 30, 2016
01d6604
update package.json to working deps
vankasteelj Oct 30, 2016
a749f9d
remove react-tools (deprecated & unused)
vankasteelj Oct 30, 2016
eda611d
update electron-version for building
vankasteelj Oct 30, 2016
f936864
move grunt escaping to a proper func
vankasteelj Oct 30, 2016
0f77dcf
add #root to css lines
vankasteelj Oct 30, 2016
a883411
specify engines (node, npm) versions to be used
vankasteelj Oct 30, 2016
ca87d95
update to babel 6
vankasteelj Nov 1, 2016
e3f4a06
remove unused & outdated grunt-rename
vankasteelj Nov 1, 2016
b2e35f8
prevent resizing logs (textarea)
vankasteelj Nov 1, 2016
3252e84
make labels clickable on checkboxes
vankasteelj Nov 1, 2016
54ee640
connect after hitting 'enter' on password input
vankasteelj Nov 1, 2016
9c26230
restore app.getVersion()
vankasteelj Nov 1, 2016
9c5b6d3
somewhat working ugly translation (fuck react and fuck electron)
vankasteelj Nov 1, 2016
a15c5c9
log ip instead of label (server)
vankasteelj Nov 1, 2016
8c8aa57
little tweak of previous mistakes
vankasteelj Nov 1, 2016
8f67ca0
localize tray
vankasteelj Nov 1, 2016
58ca0cb
indent
vankasteelj Nov 1, 2016
cdc837f
fix responsive (height less than 870px)
vankasteelj Nov 1, 2016
bf8513c
tray tooltip is 'disconnected' by default
vankasteelj Nov 1, 2016
5a15dc4
fix copy:dev for npm>3
vankasteelj Nov 1, 2016
d17d2c7
fix autoPath
vankasteelj Nov 1, 2016
c95ec9a
localize a string (forgot)
vankasteelj Nov 2, 2016
78d1f10
we need yargs
vankasteelj Nov 2, 2016
280a834
tweak BrowserWindow
vankasteelj Nov 2, 2016
1efd408
real about page
vankasteelj Nov 2, 2016
57b2814
remove openDevTools by default
vankasteelj Nov 2, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
clear object-assign node-module
  • Loading branch information
vankasteelj committed Oct 30, 2016
commit 05aeac10264bea85751d875605b93e9bdaad8390
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -28,7 +28,6 @@
"mixpanel": "kitematic/mixpanel-node",
"node-openvpn": "VPNht/node-openvpn",
"node-uuid": "1.4.7",
"object-assign": "4.1.0",
"osx-release": "1.1.0",
"react": "15.x.x",
"react-bootstrap": "0.30.x",
3 changes: 1 addition & 2 deletions src/stores/LogStore.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import {EventEmitter} from 'events';
import assign from 'object-assign';
import _ from 'lodash';
import os from 'os';
var _logs = [];

var MAX_LOG_SIZE = 3000;

module.exports = assign(Object.create(EventEmitter.prototype), {
module.exports = Object.assign(Object.create(EventEmitter.prototype), {
SERVER_LOGS_EVENT: 'server_logs_event',

error: function(line, obj) {
3 changes: 1 addition & 2 deletions src/utils/MetricsUtil.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import assign from 'object-assign';
import Mixpanel from 'mixpanel';
import uuid from 'node-uuid';
import fs from 'fs';
@@ -51,7 +50,7 @@ var Metrics = {
let osName = os.platform();
let osVersion = util.isWindows() ? os.release() : osxRelease(os.release()).version;

mixpanel.track(name, assign({
mixpanel.track(name, Object.assign({
distinct_id: id,
version: util.packagejson().version,
'Operating System': osName,
3 changes: 1 addition & 2 deletions src/utils/VPNUtil.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import _ from 'lodash';
import path from 'path';
import assign from 'object-assign';
import request from 'request';
import fs from 'fs';

@@ -31,7 +30,7 @@ switch (process.platform) {
break;
};

module.exports = assign(currentOSLib, {
module.exports = Object.assign(currentOSLib, {

generateConfig: function (managementPort) {
return new Promise((resolve, reject) => {