Commit Graph

162 Commits

Author SHA1 Message Date
Hao Nguyen
a1c8868344 Down integrate to GitHub 2019-05-13 10:52:29 -07:00
Hao Nguyen
1d4e959374 Down integrate to GitHub 2019-05-03 14:33:43 -07:00
Hao Nguyen
9276cb502e Fix gulpfile to use gulp 4 API 2019-05-01 13:22:07 -07:00
Hao Nguyen
983fd4e2ac Upgrade gulp version 2019-05-01 12:42:52 -07:00
Hao Nguyen
76b4b4b331 Down integrate to GitHub 2019-04-30 15:30:49 -07:00
Hao Nguyen
6dc9832aab Merge branch 'master' of https://github.com/protocolbuffers/protobuf into sync201904090622 2019-04-09 06:25:48 -07:00
Hao Nguyen
176f7db11d Down integrate to Github 2019-04-09 06:23:32 -07:00
Hao Nguyen
c163a2d1a4 Revert accidentally commit 2019-04-05 17:09:42 -07:00
Hao Nguyen
86bc27d220 Merge branch 'master' of https://github.com/protocolbuffers/protobuf 2019-04-05 16:41:24 -07:00
Hao Nguyen
a48a574f7e Down integrate to Github 2019-04-05 16:39:18 -07:00
Paul Yang
f425b9f059
Merge pull request #5953 from acozzette/merge-3-7-x
Merge 3.7.x into master
2019-03-28 17:28:22 -07:00
Hao Nguyen
3efc3fd4f5
Upgrade the closure compiler version (#5955)
Also update Dockerfile for JavaScript. The old one is using an npm that is too outdated
2019-03-28 09:54:13 -07:00
Adam Cozzette
8645d893ab Merge branch '3.7.x' into merge-3-7-x 2019-03-26 14:32:20 -07:00
Adam Cozzette
02cf61a7da Updated NPM version to 3.7.1 2019-03-25 09:52:46 -07:00
Hao Nguyen
3a3956e8a2
Merge pull request #5921 from haon4/contributing
Down integrate to Github
2019-03-21 15:24:08 -07:00
Daniel Kurka
38679c6afe Remove unused import in message.js. 2019-03-21 15:12:28 -07:00
Daniel Kurka
059851fe59 Remove unused import from message. 2019-03-21 15:11:56 -07:00
Hao Nguyen
2f864fdfdf Down integrate to Github 2019-03-20 11:45:01 -07:00
Hao Nguyen
d0f91c863a
Down integrate to Github (#5839)
* Down integrate to github
2019-03-06 12:39:12 -08:00
Bo Yang
cb6fa92ee8 Merge branch '3.7.x' 2019-03-04 10:18:18 -08:00
Paul Yang
582743bf40
Update version number to 3.7.0 (#5793)
* Update version number to 3.7.0

* Add php/releash.sh to Makefile.am

* Make cpp_distcheck exit on fail
2019-02-28 12:55:14 -08:00
Yilun Chong
429d2ae19f
Merge branch 'master' into integration 2019-02-24 17:17:17 -08:00
Bo Yang
b52754b719 Update version to 3.7.0rc3 2019-02-22 11:31:48 -08:00
Yilun Chong
d8c2501b43 down integration from internal 2019-02-22 18:13:33 +08:00
Xiang Dai
e479410564 delete all duplicate empty blanks (#5758)
Signed-off-by: Xiang Dai <764524258@qq.com>
2019-02-20 19:28:50 -08:00
Paul Yang
c7b3392201
Update version to 3.7.0 (#5749)
* Update version to 3.7.0

* Update version number for java bom
2019-02-19 15:54:45 -08:00
Adam Cozzette
1ee15baefc Updated version to 3.7.0rc2 2019-01-30 21:08:04 -08:00
Hao Nguyen
d5be2baa46 Update version to 3.7.0 2019-01-24 10:23:02 -08:00
Yilun Chong
cb95a7f6a8
Down-integrate internal changes to github. (#5566)
* Down-integrate internal changes to github.

* fix csharp conformance test

* add comments in conformance.proto for text format

* fix comments

* fix comments, re-generated csharp file

* fix comments, re-generated csharp file
2019-01-11 11:40:52 -08:00
Yilun Chong
0adb74c2d3 Down-integrate internal changes to github. (#5555)
* Down-integrate internal changes to github.

* fix python conformance test

* fix csharp conformance test

* add back java map_lite_test.proto's optimize for option

* fix php conformance test
2019-01-08 15:06:30 -08:00
Bo Yang
624a40a387 Down-integrate internal changes to github. 2018-12-20 14:21:20 -08:00
Adam Cozzette
24204c9c4f Added new JS test protos to gulpfile.js 2018-11-09 11:40:27 -08:00
Adam Cozzette
0894e07536 Integrated internal changes from Google 2018-11-09 11:28:22 -08:00
Feng Xiao
afe98de32a Replace repo links. 2018-08-22 11:55:30 -07:00
Feng Xiao
a8465b738e Merge master branch. 2018-08-08 17:14:42 -07:00
Feng Xiao
6bbe197e9c Down-integrate from google3. 2018-08-08 17:00:41 -07:00
Yilun Chong
9bbc4b1fab
Merge pull request #4981 from BSBandme/fix_js_skipgroup
Fix js reader.js's skipGroup
2018-08-08 11:01:53 -07:00
Yilun Chong
600e4e5f3b fix 2018-08-01 15:39:03 -07:00
Adam Cozzette
94d55e5292 Merge branch '3.6.x' into merge-3-6-x 2018-08-01 13:44:55 -07:00
Yilun Chong
1bec76f04c fix 2018-08-01 13:24:54 -07:00
Yilun Chong
2ab6cb4570 fix 2018-08-01 10:06:27 -07:00
Yilun Chong
ed1cd2c5c6 fix 2018-07-31 15:14:08 -07:00
Yilun Chong
82a4e4e3d3 Fix js reader.js's skipGroup 2018-07-31 11:35:48 -07:00
Adam Cozzette
9e1286b949 Updated version numbers to 3.6.1 2018-07-27 13:30:28 -07:00
Feng Xiao
2dcd6ae409
Remove/replace travis references (#4953)
* Remove/replace travis references.
2018-07-22 17:14:24 -07:00
Joshua Haberman
0ea3d74c3d
Merge pull request #4299 from hekike/feat/add-commonjs-strict-import-style
Feat: add import-style=commonjs_strict option to the compiler
2018-07-02 13:58:42 -07:00
Adam Cozzette
d1af029104 Fixed JS parsing of unspecified map keys
We need to use a default of 0 when parsing unspecified map keys, instead
of failing an assertion.

This change was written by Michael Aaron (michaelaaron@google.com) but I
am cherry-picking it directly instead of waiting for the next sync of
Google-internal changes.
2018-05-25 14:44:22 -07:00
Jisi Liu
45eb28b588 Update version number to 3.6.0 2018-05-14 16:06:22 -07:00
Peter Marton
13f94b4092 Fix strict JS generator with import in a protofile 2018-05-08 09:23:56 -07:00
Peter Marton
3c4e368473 Test: cover import_style=commonjs_strict 2018-05-08 09:23:56 -07:00