Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-03-30 | 114 | -6935/+4729 | |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | ||||||
| | * | | | | Integrate google internal changes. | Jisi Liu | 2016-03-30 | 269 | -4802/+34402 | |
* | | | | | | Merge pull request #1400 from jskeet/fix-internal | Jan Tattermusch | 2016-04-10 | 1 | -1/+2 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | ||||||
| * | | | | | Fix to csharp_options - initialize internal_access to false. | Jon Skeet | 2016-04-08 | 1 | -1/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1393 from gvaish/master | Jon Skeet | 2016-04-07 | 3 | -1/+6 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Added support for internal_access for C# | Gaurav Vaish | 2016-04-07 | 3 | -1/+6 | |
* | | | | | Merge pull request #1392 from anandolee/master | Jie Luo | 2016-04-07 | 8 | -19/+41 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | sync the Manually integrate changes in google3/third_party | Jie Luo | 2016-04-06 | 8 | -19/+41 | |
* | | | | | Merge pull request #1390 from jskeet/tidy-up | Jon Skeet | 2016-04-07 | 21 | -49/+111 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add more documentation for csharp_options.h | Jon Skeet | 2016-04-06 | 2 | -6/+18 | |
| * | | | | | Line-wrapping changes only for C# generator code | Jon Skeet | 2016-04-06 | 20 | -44/+94 | |
* | | | | | | Merge pull request #1391 from thomasvl/string_tweaks | Thomas Van Lenten | 2016-04-06 | 2 | -9/+47 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Error during parsing for invalid UTF-8 instead of dropping dropping data. | Thomas Van Lenten | 2016-04-05 | 2 | -9/+9 | |
| * | | | | | | Add tests to ensure we read strings with BOMs so we don't forget about lesson... | Thomas Van Lenten | 2016-04-05 | 1 | -0/+38 | |
| |/ / / / / | ||||||
* / / / / / | Updating Xcode Settings to use iOS 9.3 | Geoffrey Wiseman | 2016-04-06 | 1 | -0/+8 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1349 from gvaish/master | Jon Skeet | 2016-04-05 | 32 | -84/+177 | |
|\ \ \ \ \ | ||||||
| * | | | | | Added access_level for types | Gaurav Vaish | 2016-04-05 | 32 | -84/+177 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #1386 from andrewharp/patch-2 | Feng Xiao | 2016-04-05 | 1 | -2/+12 | |
|\ \ \ \ \ | ||||||
| * | | | | | Update BUILD | Andrew Harp | 2016-04-04 | 1 | -1/+1 | |
| * | | | | | Do not link in pthread library for Android builds. | Andrew Harp | 2016-04-04 | 1 | -2/+12 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #852 from qzix/master | Thomas Van Lenten | 2016-04-04 | 5 | -11/+41 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Added deprecated option handling for objective-c generator | Oleg Vereshko | 2016-04-04 | 5 | -11/+41 | |
* | | | | | Merge pull request #1353 from keveman/master | Joshua Haberman | 2016-04-01 | 2 | -17/+30 | |
|\ \ \ \ \ | ||||||
| * | | | | | Linking the cpp implementation extension statically with libprotobuf | Manjunath Kudlur | 2016-04-01 | 2 | -17/+30 | |
* | | | | | | Merge pull request #1377 from jskeet/remove-duplicate-tests | Jon Skeet | 2016-04-01 | 2 | -2/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove duplicate test cases. | Jon Skeet | 2016-04-01 | 2 | -2/+0 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #1378 from thomasvl/manual_stream_parsing_helpers | Thomas Van Lenten | 2016-04-01 | 2 | -0/+17 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Add -position and -isAtEnd for use when manually parsing input streams. | Thomas Van Lenten | 2016-04-01 | 2 | -0/+17 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1369 from jskeet/tools-nuspec | Jan Tattermusch | 2016-03-31 | 2 | -14/+37 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Remove duplicate line | Jon Skeet | 2016-03-31 | 1 | -1/+0 | |
| * | | | | Introduce a new nuget package, Google.Protobuf.Tools, basically to contain pr... | Jon Skeet | 2016-03-31 | 2 | -14/+38 | |
* | | | | | Merge pull request #1371 from keveman/oversize_protos | Joshua Haberman | 2016-03-31 | 2 | -11/+94 | |
|\ \ \ \ \ | ||||||
| * | | | | | Added an API to allow oversize protos when using C++ extension in Python | Manjunath Kudlur | 2016-03-31 | 2 | -11/+94 | |
* | | | | | | Merge pull request #1366 from xyzzyz/int128_ostream | Feng Xiao | 2016-03-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Replace #include <iostream> with #include <ostream> | Adam Michalik | 2016-03-30 | 1 | -1/+1 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #1362 from jskeet/tweak_json_name | Jan Tattermusch | 2016-03-30 | 1 | -61/+39 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Refactoring of FieldDescriptor | Jon Skeet | 2016-03-30 | 1 | -61/+39 | |
| |/ / / | ||||||
* | | | | Merge pull request #1360 from pherl/master | Jisi Liu | 2016-03-30 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Use the T() instead of NULL for the default value. | Jisi Liu | 2016-03-29 | 1 | -1/+1 | |
* | | | | | Merge pull request #1295 from haberman/docker | Joshua Haberman | 2016-03-30 | 9 | -36/+448 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Merge branch 'master' into docker | Josh Haberman | 2016-03-29 | 101 | -6889/+4074 | |
| |\| | | | ||||||
| * | | | | Rearranged and commented files for running under Jenkins. | Josh Haberman | 2016-03-04 | 11 | -140/+115 | |
| * | | | | Disable attempt to use ccache for docker build. | Josh Haberman | 2016-03-03 | 3 | -20/+13 | |
| * | | | | Properly report C++ build time. | Josh Haberman | 2016-03-03 | 3 | -8/+15 | |
| * | | | | Use a local Maven repository to avoid network fetches during tests. | Josh Haberman | 2016-03-03 | 2 | -0/+31 | |
| * | | | | Make Java copy into separate directories so the tests can run concurrently. | Josh Haberman | 2016-03-02 | 1 | -5/+9 | |
| * | | | | Added code to generate XML output file for more granular results. | Josh Haberman | 2016-03-02 | 5 | -11/+122 | |
| * | | | | Added Ruby 2.1, Oracle Java, and C#. | Josh Haberman | 2016-03-02 | 3 | -21/+76 | |
| * | | | | Upgrade Python packages using pip. | Josh Haberman | 2016-03-02 | 1 | -1/+7 | |
| * | | | | Work around tox bug. | Josh Haberman | 2016-03-02 | 1 | -0/+4 |