aboutsummaryrefslogtreecommitdiffhomepage
path: root/package.json
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/v1.4.x' into upmerge_1.4.xGravatar murgatroid992017-06-15
|\
* | fix remaining license noticesGravatar Jan Tattermusch2017-06-08
| * Merge pull request #11340 from murgatroid99/node_8_supportGravatar Michael Lumish2017-05-31
| |\
| | * Add artifact builds for Node 8Gravatar murgatroid992017-05-30
* | | master bumped to 1.5.xGravatar David Garcia Quintas2017-05-30
| |/ |/|
| * 1.4.x branch cut, version bump PRGravatar David Garcia Quintas2017-05-30
|/
* Upmerge from v1.3.x branch to masterGravatar Stanley Cheung2017-05-17
|\
| * Bump to version 1.3.3Gravatar Ken Payson2017-05-16
| * Bump to version 1.3.2Gravatar Stanley Cheung2017-05-10
| * Bump to 1.3.2-pre1Gravatar Stanley Cheung2017-05-09
| * Update version to 1.3.1Gravatar murgatroid992017-05-04
| * Switch Protobuf.js dependency back to version 5Gravatar murgatroid992017-05-02
* | Merge branch 'v1.3.x' into master-upmerge-v1.3.xGravatar David Garcia Quintas2017-04-28
|\ \
| | * 1.3.0 -> 1.3.1-pre1Gravatar David Garcia Quintas2017-04-27
| | * s/1.3.0-pre/1.3.0Gravatar David Garcia Quintas2017-04-27
| | * Revert "Merge branch 'master' into v1.3.x"Gravatar Alexander Polcyn2017-04-26
| | * Merge branch 'master' into v1.3.xGravatar Yuchen Zeng2017-04-25
| |/| | |/ |/|
| * Node: Don't depend on cares npm packageGravatar murgatroid992017-04-19
* | master to 1.4.0-devGravatar David Garcia Quintas2017-04-13
| * 1.3.x branch cutGravatar David Garcia Quintas2017-04-13
|/
* Fix serializer error handling, update ProtoBuf.js dependencyGravatar murgatroid992017-04-03
* Merge branch 'master' into node_protobuf_js_6_upgradeGravatar Michael Lumish2017-04-03
|\
| * Merge pull request #7771 from y-zeng/cares_buildinGravatar Yuchen Zeng2017-03-24
| |\
* | | Merge branch 'master' into node_protobuf_js_6_upgradeGravatar Michael Lumish2017-03-24
|\| |
| * | Merge branch 'v1.2.x' of https://github.com/grpc/grpc into upmerge-1.2.0Gravatar Nicolas "Pixel" Noble2017-03-24
| |\ \
| | * | bump v1.2.x branch to 1.2.1-pre1Gravatar Alexander Polcyn2017-03-20
| | * | Going for 1.2.0Gravatar David Garcia Quintas2017-03-20
| | | * Merge remote-tracking branch 'upstream/master' into cares_bazel_ruleGravatar Yuchen Zeng2017-03-17
| | | |\ | | |_|/ | |/| |
* / | | Upgrade Node dependency on Protobuf.js to version 6Gravatar murgatroid992017-03-17
|/ / /
| * | Bump 1.2.x version to pre-2Gravatar Ken Payson2017-03-16
| * | Drop support for io.js, fix minor issue with node extensionGravatar murgatroid992017-03-14
| * | Introducing 1.2.0-pre1Gravatar David Garcia Quintas2017-03-09
* | | Bumped version to 1.3.0-devGravatar David Garcia Quintas2017-03-09
|/ /
| * Merge remote-tracking branch 'upstream/master' into cares_bazel_ruleGravatar Yuchen Zeng2017-02-01
| |\ | |/ |/|
* | Bump master version numbersGravatar Craig Tiller2017-01-30
| * Merge remote-tracking branch 'upstream/master' into cares_buildinGravatar Yuchen Zeng2017-01-18
| |\ | |/ |/|
* | Merge branch 'master' into node_electron_buildGravatar murgatroid992017-01-13
|\ \
| * | Update package.json with version compatibility changesGravatar murgatroid992016-11-29
* | | Merge branch 'master' into node_electron_buildGravatar murgatroid992016-11-01
|\| |
* | | Add test scripts for electronGravatar murgatroid992016-11-01
| | * Merge remote-tracking branch 'upstream/master' into cares_buildinGravatar Yuchen Zeng2016-10-28
| | |\ | | |/ | |/|
| * | Merge remote-tracking branch 'upstream/v1.0.x' into v1.0.1_upmergeGravatar murgatroid992016-10-28
| |\ \
| | * | Going 1.0.1.Gravatar Nicolas "Pixel" Noble2016-10-26
| * | | SanitizeGravatar murgatroid992016-10-24
| | * | Merge remote-tracking branch 'upstream/v1.0.x' into node_package_updatesGravatar murgatroid992016-10-24
| | |\ \
| * | | | Fix issues with express benchmark and synchronize package.json with templateGravatar murgatroid992016-10-18
| * | | | Create benchmark client and server for Node ExpressGravatar murgatroid992016-10-18
|/ / / /
| | | * Merge remote-tracking branch 'upstream/master' into cares_buildinGravatar Yuchen Zeng2016-08-24
| | | |\ | |_|_|/ |/| | |
| | | * Use cares package in nodeGravatar Yuchen Zeng2016-08-22
| | * | Bumping version to 1.0.1-pre1.Gravatar Nicolas "Pixel" Noble2016-08-18