Paul Yang
7bff8393ca
Down Integrate to GitHub ( #6414 )
...
* Down integrate to GitHub
* Fix broken tests
2019-07-19 14:49:01 -07:00
Hao Nguyen
d0f91c863a
Down integrate to Github ( #5839 )
...
* Down integrate to github
2019-03-06 12:39:12 -08:00
Yilun Chong
d8c2501b43
down integration from internal
2019-02-22 18:13:33 +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
Adam Cozzette
0894e07536
Integrated internal changes from Google
2018-11-09 11:28:22 -08:00
Feng Xiao
6bbe197e9c
Down-integrate from google3.
2018-08-08 17:00:41 -07:00
Jisi Liu
09354db143
Merge from Google internal for 3.4 release
2017-07-18 15:38:30 -07:00
Adam Cozzette
b4dd686ab4
Updated enum names in test.proto to avoid conflicting with testbinary.proto
2016-11-21 09:08:23 -08:00
Adam Cozzette
5a76e633ea
Integrated internal changes from Google
2016-11-17 16:59:59 -08:00
Adam Cozzette
4a4a1627c1
Fixed references to foreign nested messages with CommonJS-style imports
...
A bug was causing generated JSPB code with CommonJS-style imports to
refer incorrectly to nested messages from other .proto files. The
generated code would have things like "test_pb.InnerMessage" instead of
"test_pb.OuterMessage.InnerMessage". This commit fixes the problem by
correctly taking into account any message nesting.
2016-10-10 11:44:21 -07:00
Joshua Haberman
af62fde5e8
Fix for maps_test.js in JavaScript. ( #2145 )
...
Had to strip out some JSPB-format test code,
but also added some .proto test messages that
had been improperly stripped out.
2016-10-10 11:23:36 -07:00
Feng Xiao
9086d96439
Integrate from internal code base.
2016-07-13 13:48:40 -07:00
Adam Cozzette
c64d86ed4f
Fixed failing JS tests
...
A couple of small tweaks were needed to fix test failures that were
inadvertently introduced in the last down integration. I also had to add
the map.js file which was missing.
2016-07-06 14:11:39 -07:00
Adam Cozzette
d64a2d9941
Integrated internal changes from Google
...
This includes all internal changes from around May 20 to now.
2016-06-29 15:38:03 -07:00
Jisi Liu
3b3c8abb96
Integrate google internal changes.
2016-03-30 11:39:59 -07:00
murgatroid99
a862b6b77f
Fix CommonJS relative require generation, and test it
2016-02-24 13:44:57 -08:00
Josh Haberman
77af5d04b1
Fixed nested message scopes for CommonJS.
2016-02-18 10:30:21 -08:00
Feng Xiao
e841bac4fc
Down-integrate from internal code base.
2015-12-11 17:10:28 -08:00
