protobuf

Commit Graph

Author	SHA1	Message	Date
Paul Yang	7bff8393ca	Down Integrate to GitHub (#6414 ) * Down integrate to GitHub * Fix broken tests	5 years ago
Hao Nguyen	d0f91c863a	Down integrate to Github (#5839 ) * Down integrate to github	6 years ago
Yilun Chong	d8c2501b43	down integration from internal	6 years ago
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	6 years ago
Adam Cozzette	0894e07536	Integrated internal changes from Google	6 years ago
Feng Xiao	6bbe197e9c	Down-integrate from google3.	6 years ago
Jisi Liu	09354db143	Merge from Google internal for 3.4 release	7 years ago
Adam Cozzette	b4dd686ab4	Updated enum names in test.proto to avoid conflicting with testbinary.proto	8 years ago
Adam Cozzette	5a76e633ea	Integrated internal changes from Google	8 years ago
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.	8 years ago
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.	8 years ago
Adam Cozzette	c4d70123ac	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.	8 years ago
Joshua Haberman	679381fba8	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.	8 years ago
Feng Xiao	9086d96439	Integrate from internal code base.	9 years ago
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.	9 years ago
Adam Cozzette	d64a2d9941	Integrated internal changes from Google This includes all internal changes from around May 20 to now.	9 years ago
Jisi Liu	3b3c8abb96	Integrate google internal changes.	9 years ago
murgatroid99	a862b6b77f	Fix CommonJS relative require generation, and test it	9 years ago
Josh Haberman	77af5d04b1	Fixed nested message scopes for CommonJS.	9 years ago
Feng Xiao	e841bac4fc	Down-integrate from internal code base.	9 years ago

18 Commits (88529f5017a3fd4a7cd4d666e541a3934e6491bd)