1525 Commits

Author SHA1 Message Date
Nicolas Noble
f2b2bedb31
Merge pull request #291 from nicolasnoble/electron2
Let's start building electron 2 binaries.
2018-05-01 19:27:56 -07:00
Nicolas "Pixel" Noble
1ef4c90270 Let's start building electron 2 binaries. 2018-05-02 03:36:33 +02:00
Michael Lumish
1b9b9897e3
Merge pull request #298 from murgatroid99/proto_loader_include_option_name_change
Change 'include' to 'includeDirs' in proto-loader package
v1.11.0
2018-04-30 14:59:22 -07:00
Michael Lumish
c9aa5f710c
Merge pull request #299 from murgatroid99/v1.11.0_bump
Bump version to v1.11.0
2018-04-30 14:45:08 -07:00
Michael Lumish
9cab9e2d4f
Merge pull request #295 from murgatroid99/protobuf_bump_backport
Update protobufjs version
2018-04-30 14:30:02 -07:00
murgatroid99
d1c973890e Bump version to v1.11.0 2018-04-30 14:00:42 -07:00
Michael Lumish
aac7d76e39
Merge pull request #297 from murgatroid99/node4_test_script_fix
Don't upgrade npm in Windows tests
2018-04-30 13:49:19 -07:00
murgatroid99
a63f534979 Change 'include' to 'includeDirs' in proto-loader package 2018-04-30 13:31:12 -07:00
murgatroid99
5405aa31f4 Upgrade npm on Node 4 2018-04-30 13:04:03 -07:00
murgatroid99
ff16b66b6f Don't upgrade npm in Windows tests 2018-04-30 09:39:56 -07:00
Nikos Koumbakis
cf004c30a5 Update protobufjs version
Fixes [ReDoS Vulnerability](https://github.com/dcodeIO/protobuf.js/releases/tag/6.8.6)
2018-04-27 14:20:30 -07:00
Michael Lumish
f1acaf299a
Merge pull request #285 from murgatroid99/ts_style_cleanup
Fix lint errors and formatting
2018-04-18 16:54:13 -07:00
murgatroid99
881b82d50c Fix lint errors and formatting 2018-04-18 11:32:46 -07:00
Michael Lumish
5c9a79272d
Merge pull request #283 from kjin/v1.11.x-backport-275
Backport #275 to v1.11.x
2018-04-17 16:14:01 -07:00
Michael Lumish
d5a3e5da9f
Merge pull request #282 from murgatroid99/purejs_unimplemented_errors
Pure JS: Add unimplemented errors for several API functions
2018-04-17 16:11:58 -07:00
Kelvin Jin
9112ac194b js: only listen for channel connect event once 2018-04-17 14:10:36 -07:00
murgatroid99
dd3eb9e0f8 Add unimplemented errors for several API functions 2018-04-17 14:06:52 -07:00
Michael Lumish
e389a251d1
Merge pull request #276 from murgatroid99/submodule_reversion
Switch grpc submodule to v1.10.x
2018-04-13 15:49:28 -07:00
murgatroid99
eabda8118a Switch grpc submodule to v1.10.x 2018-04-13 10:29:11 -07:00
Michael Lumish
b4e677cb46
Merge pull request #269 from murgatroid99/pure_js_alpha_note
Add note about @grpc/grpc-js alpha status
2018-04-11 16:00:29 -07:00
Michael Lumish
b99bfc42ca
Merge pull request #270 from murgatroid99/nvm_upgrade_backport
Backport nvm changes to v1.11.x
2018-04-11 15:08:09 -07:00
Nicolas "Pixel" Noble
aaf8696d42 Workarounding node-gyp issue. 2018-04-11 14:10:16 -07:00
Nicolas "Pixel" Noble
8c92bdbc33 Adding more environment details. 2018-04-11 14:10:08 -07:00
Nicolas "Pixel" Noble
dc071f906b Debugging info. 2018-04-11 14:09:39 -07:00
Nicolas "Pixel" Noble
2bab8dc02b Changing to the powershell version of nvm for better support. 2018-04-11 14:09:31 -07:00
murgatroid99
27cc80adac Add note about @grpc/grpc-js alpha status 2018-04-11 13:29:49 -07:00
Michael Lumish
37460f01f3
Merge pull request #266 from murgatroid99/upmerge_zdefs_fix
Backport "Removing zdefs" to v1.11.x
2018-04-10 11:16:35 -07:00
Nicolas "Pixel" Noble
37a811b630 Removing zdefs. 2018-04-10 10:18:03 -07:00
Michael Lumish
71429fa12b
Merge pull request #261 from murgatroid99/another_submodule_update
Update v1.11.x to v1.11.0-pre1 for real this time with bugfixes
2018-04-06 13:49:08 -07:00
murgatroid99
55106fa154 Update v1.11.x to v1.11.0-pre1 for real this time with bugfixes 2018-04-06 11:57:44 -07:00
Michael Lumish
4ae876d929
Merge pull request #259 from murgatroid99/protobuf_package_improvements
Improve proto-loader package.json and documentation to prepare to publish it
2018-04-05 15:08:50 -07:00
murgatroid99
48817ceaea Improve proto-loader package.json and documentation to prepare to publish it 2018-04-05 14:24:15 -07:00
Michael Lumish
0dfd199c38
Merge pull request #256 from murgatroid99/v1.10.x_upmerge
V1.10.x upmerge
2018-04-04 16:45:24 -07:00
murgatroid99
763a48f6fb Merge remote-tracking branch 'upstream/v1.10.x' into v1.10.x_upmerge 2018-04-04 15:56:02 -07:00
Michael Lumish
799aee603d
Merge pull request #252 from murgatroid99/v1.11.x_submodule_update
Update master to v1.11.0-dev
2018-04-04 15:48:13 -07:00
murgatroid99
4f9ce64f8b Update master to v1.11.0-dev 2018-04-04 15:08:26 -07:00
Nicolas Noble
5a761f757e
Merge pull request #253 from kellycampbell/protobufjsVersion-msg
Update error msg for Protobuf.js detection options
2018-04-04 07:34:55 -07:00
Kelly Campbell
434e6c45c1 Update error msg for Protobuf.js detection from 'protobufjs_version' to 'protobufjsVersion' 2018-04-03 19:58:42 -04:00
Michael Lumish
0cd71d959e
Merge pull request #234 from ofrobots/nan-callback
fix: avoid using deprecated Nan APIs
2018-04-03 16:53:47 -07:00
Ali Ijaz Sheikh
4bfa1430ef fix: avoid using deprecated Nan APIs
Starting with Nan 2.9.x certain Nan::Callback::Call APIs are
deprecated. Instead there are mechanisms in place that allow native
modules to preserve async context across async calls.
2018-04-03 16:02:46 -07:00
Nicolas Noble
f54301af7c
Merge pull request #249 from nicolasnoble/builds-never-fail
Build failures on Windows should be noticed.
2018-04-03 14:45:28 -07:00
Michael Lumish
43dfc7fa48
Merge pull request #248 from murgatroid99/server_memory_management_fixes
Fix object lifetime and memory management problems in server code
2018-04-03 12:19:26 -07:00
murgatroid99
c41a6813ae Start server after adding server ports 2018-04-03 10:57:04 -07:00
murgatroid99
05007312a7 Replace another variable length stack array with a vector 2018-04-03 09:50:36 -07:00
murgatroid99
265c8fcfc8 Fix incorrect C++ usage 2018-04-02 18:27:29 -07:00
Nicolas "Pixel" Noble
4ba954a3eb Build failures on Windows should be noticed. 2018-04-03 02:00:25 +02:00
murgatroid99
0210f160ed Fix object lifetime and memory management problems in server code 2018-04-02 14:37:35 -07:00
Nicolas Noble
adf1303928
Merge pull request #245 from nicolasnoble/downgrade-for-realzies
Downgrading node-pre-gyp.
v1.10.1
2018-03-28 15:35:02 -07:00
Nicolas "Pixel" Noble
67dfef8ef3 Downgrading node-pre-gyp.
Starting probably with https://github.com/mapbox/node-pre-gyp/pull/299, the contents of the tarballs are bloated. Rolling back to 0.7.0.
2018-03-29 00:30:59 +02:00
Michael Lumish
e9a7f5ae07
Merge pull request #242 from murgatroid99/new_packages_readme
Add README files for new packages
2018-03-28 14:13:49 -07:00