Commit Graph

12 Commits

Author SHA1 Message Date
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