Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Fixed JS parsing of unspecified map keys | Adam Cozzette | 2018-05-25 |
| | | | | | | | | | 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. | ||
* | Merge branch 'master' into down-integrate | Adam Cozzette | 2018-03-13 |
|\ | |||
* | | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 |
| | | |||
| * | Merge pull request #3186 from gkelly/remove-unused-variable | Feng Xiao | 2018-02-20 |
|/| | | | | | Remove unused output_file variable from js_embed | ||
* | | Integrated internal changes from Google | Adam Cozzette | 2017-12-01 |
| | | |||
* | | Merge from google internal | Jisi Liu | 2017-10-18 |
| | | |||
* | | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 |
| | | |||
* | | Merge branch 'master' into 3.4.x | Bo Yang | 2017-08-05 |
|\ \ | |||
| * | | Fix quotation marks | Adam | 2017-07-24 |
| | | | |||
| * | | Fix issue #1745 - javascript allow dot in filename | Adam | 2017-07-24 |
| | | | |||
* | | | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 |
|/ / | |||
| * | Remove unused output_file variable from js_embed | Garret Kelly | 2017-06-05 |
|/ | | | | | The js_embed tool outputs to stdout, so the output_file variable is unnecessary and unused. | ||
* | Down-integrate from google3. | Feng Xiao | 2017-03-29 |
| | |||
* | Fix generation of extending nested messages in JavaScript (#2439) | Marcus Longmuir | 2017-01-06 |
| | | | | | | * Fix generation of extending nested messages in JavaScript * Added missing test8.proto to build | ||
* | Merge pull request #2536 from jbrianceau/fix-js-embed-include-style | Adam Cozzette | 2017-01-04 |
|\ | | | | | Fix include in auto-generated well_known_types_embed.cc | ||
| * | Fix include in auto-generated well_known_types_embed.cc | Julien Brianceau | 2016-12-27 |
| | | | | | | | | | | Restore include style fix (e3da722) that has been trampled by auto-generation of well_known_types_embed.cc | ||
* | | Fix warning in compiler/js/embed.cc | Julien Brianceau | 2016-12-27 |
|/ | | | | | | | embed.cc: In function ‘std::string CEscape(const string&)’: embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (int i = 0; i < str.size(); ++i) { ^ | ||
* | Auto-generate well_known_types_embed.cc | Adam Cozzette | 2016-12-19 |
| | | | | | | | Until now this file was just checked into the repo, but actually it should be generated from any.js, struct.js, and timestamp.js. This change updates the build system to make this happen. To make it work I also had to remove some C++11 features from embed.cc. | ||
* | Add missing include in embed.cc | Julien Brianceau | 2016-12-13 |
| | | | | | This changes fixes "error C2039: 'getline': is not a member of 'std'" compilation error. | ||
* | Fix #include in cc files | Julien Brianceau | 2016-12-09 |
| | |||
* | Add missing include in embed.cc | Julien Brianceau | 2016-12-08 |
| | | | | | This changes fixes "use of undeclared identifier 'assert'" compilation error. | ||
* | Integrated internal changes from Google | Adam Cozzette | 2016-11-17 |
| | |||
* | Fixed references to foreign nested messages with CommonJS-style imports | Adam Cozzette | 2016-10-10 |
| | | | | | | | | 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. | ||
* | Fixed quadratic behavior in JSPB deserialization of repeated fields (#2117) ↵ | Adam Cozzette | 2016-10-10 |
| | | | | | | | | | (#2146) Currently deserialization of a non-packed binary repeated field is quadratic in the number of elements, because each time we parse a new element we copy over all elements we have parsed so far. This CL fixes the performance problem by having the generated deserialization code just call addX() instead of using getX() and setX(). | ||
* | Integrate internal changes | Bo Yang | 2016-10-10 |
| | |||
* | Add and fix C++ runtime docs | Jisi Liu | 2016-08-02 |
| | |||
* | restore old behavior for toObject | Nikolai Vavilov | 2016-07-19 |
| | |||
* | nits | Nikolai Vavilov | 2016-07-19 |
| | |||
* | Make implicit defaults consistent with explicit defaults | Nikolai Vavilov | 2016-07-19 |
| | |||
* | Merge pull request #1802 from haberman/jsmapbin | Joshua Haberman | 2016-07-18 |
|\ | | | | | JavaScript: segregate references to binary functionality | ||
| * | JavaScript: move extension binary info to separate struct. | Josh Haberman | 2016-07-18 |
| | | |||
| * | JavaScript maps: move binary callbacks out of constructor. | Josh Haberman | 2016-07-18 |
| | | | | | | | | | | | | This change will help us separate binary support into separate files, because we only refer to binary serialization functions in the actual binary serialization paths. | ||
* | | Integrate from internal code base. | Feng Xiao | 2016-07-13 |
|/ | |||
* | Fix spelling in strings and comments | Otto Kekäläinen | 2016-07-03 |
| | |||
* | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 |
| | | | | This includes all internal changes from around May 20 to now. | ||
* | Bugfix: base the require logic on the file being required. | Josh Haberman | 2016-06-16 |
| | |||
* | JS: import well-known types from google-protobuf package. | Josh Haberman | 2016-06-16 |
| | |||
* | Merge pull request #1547 from xyzzyz/js_generator | Joshua Haberman | 2016-05-18 |
|\ | | | | | Fix #include in js_generator.cc | ||
* | | Integrate interanl changes | Bo Yang | 2016-05-18 |
| | | |||
| * | Fix #include in js_generator.cc | Adam Michalik | 2016-05-17 |
|/ | | | | | The commit 3b3c8abb9635eb3ea078a821a99c9ef29d66dff7 has replaced the <> with "" in #include statement in js_generator.cc | ||
* | Down integrate from Google internal. | Jisi Liu | 2016-04-28 |
| | |||
* | Integrate google internal changes. | Jisi Liu | 2016-03-30 |
| | |||
* | Fix CommonJS relative require generation, and test it | murgatroid99 | 2016-02-24 |
| | |||
* | Fixed definition of extensions, and added CommonJS tests to Travis. | Josh Haberman | 2016-02-18 |
| | |||
* | Fixed nested message scopes for CommonJS. | Josh Haberman | 2016-02-18 |
| | |||
* | CommonJS tests are now passing. | Josh Haberman | 2016-02-18 |
| | |||
* | WIP. | Josh Haberman | 2016-02-18 |
| | |||
* | Fix for Visual Studio 2008. | Feng Xiao | 2015-12-30 |
| | |||
* | Fix a compiler warning. | Feng Xiao | 2015-12-28 |
| | | | | Change-Id: I4c4e2a4a248e4336fef735f75ff5648d8d33627e | ||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 |