Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 | 1 | -0/+8 |
| | |||||
* | Updated enum names in test.proto to avoid conflicting with testbinary.proto | Adam Cozzette | 2016-11-21 | 1 | -3/+3 |
| | |||||
* | Integrated internal changes from Google | Adam Cozzette | 2016-11-17 | 1 | -3/+6 |
| | |||||
* | Fixed references to foreign nested messages with CommonJS-style imports | Adam Cozzette | 2016-10-10 | 1 | -0/+8 |
| | | | | | | | | 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. | ||||
* | Fix for maps_test.js in JavaScript. (#2145) | Joshua Haberman | 2016-10-10 | 1 | -0/+26 |
| | | | | | Had to strip out some JSPB-format test code, but also added some .proto test messages that had been improperly stripped out. | ||||
* | Integrate from internal code base. | Feng Xiao | 2016-07-13 | 1 | -0/+1 |
| | |||||
* | Fixed failing JS tests | Adam Cozzette | 2016-07-06 | 1 | -0/+4 |
| | | | | | | 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. | ||||
* | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 | 1 | -0/+1 |
| | | | | This includes all internal changes from around May 20 to now. | ||||
* | Integrate google internal changes. | Jisi Liu | 2016-03-30 | 1 | -0/+12 |
| | |||||
* | Fix CommonJS relative require generation, and test it | murgatroid99 | 2016-02-24 | 1 | -1/+0 |
| | |||||
* | Fixed nested message scopes for CommonJS. | Josh Haberman | 2016-02-18 | 1 | -0/+7 |
| | |||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 1 | -0/+212 |