aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | Temporarily disable begin is fast test.Jisi Liu2016-03-311-1/+2
| | * | | | Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-30114-6935/+4729
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Integrate google internal changes.Jisi Liu2016-03-30269-4802/+34402
* | | | | | Merge pull request #1400 from jskeet/fix-internalJan Tattermusch2016-04-101-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix to csharp_options - initialize internal_access to false.Jon Skeet2016-04-081-1/+2
|/ / / / /
* | | | | Merge pull request #1393 from gvaish/masterJon Skeet2016-04-073-1/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Added support for internal_access for C#Gaurav Vaish2016-04-073-1/+6
* | | | | Merge pull request #1392 from anandolee/masterJie Luo2016-04-078-19/+41
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | sync the Manually integrate changes in google3/third_partyJie Luo2016-04-068-19/+41
* | | | | Merge pull request #1390 from jskeet/tidy-upJon Skeet2016-04-0721-49/+111
|\ \ \ \ \
| * | | | | Add more documentation for csharp_options.hJon Skeet2016-04-062-6/+18
| * | | | | Line-wrapping changes only for C# generator codeJon Skeet2016-04-0620-44/+94
* | | | | | Merge pull request #1391 from thomasvl/string_tweaksThomas Van Lenten2016-04-062-9/+47
|\ \ \ \ \ \
| * | | | | | Error during parsing for invalid UTF-8 instead of dropping dropping data.Thomas Van Lenten2016-04-052-9/+9
| * | | | | | Add tests to ensure we read strings with BOMs so we don't forget about lesson...Thomas Van Lenten2016-04-051-0/+38
| |/ / / / /
* / / / / / Updating Xcode Settings to use iOS 9.3Geoffrey Wiseman2016-04-061-0/+8
|/ / / / /
* | | | | Merge pull request #1349 from gvaish/masterJon Skeet2016-04-0532-84/+177
|\ \ \ \ \
| * | | | | Added access_level for typesGaurav Vaish2016-04-0532-84/+177
| | |/ / / | |/| | |
* | | | | Merge pull request #1386 from andrewharp/patch-2Feng Xiao2016-04-051-2/+12
|\ \ \ \ \
| * | | | | Update BUILDAndrew Harp2016-04-041-1/+1
| * | | | | Do not link in pthread library for Android builds.Andrew Harp2016-04-041-2/+12
|/ / / / /
* | | | | Merge pull request #852 from qzix/masterThomas Van Lenten2016-04-045-11/+41
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added deprecated option handling for objective-c generatorOleg Vereshko2016-04-045-11/+41
* | | | | Merge pull request #1353 from keveman/masterJoshua Haberman2016-04-012-17/+30
|\ \ \ \ \
| * | | | | Linking the cpp implementation extension statically with libprotobufManjunath Kudlur2016-04-012-17/+30
* | | | | | Merge pull request #1377 from jskeet/remove-duplicate-testsJon Skeet2016-04-012-2/+0
|\ \ \ \ \ \
| * | | | | | Remove duplicate test cases.Jon Skeet2016-04-012-2/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1378 from thomasvl/manual_stream_parsing_helpersThomas Van Lenten2016-04-012-0/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add -position and -isAtEnd for use when manually parsing input streams.Thomas Van Lenten2016-04-012-0/+17
|/ / / / /
* | | | | Merge pull request #1369 from jskeet/tools-nuspecJan Tattermusch2016-03-312-14/+37
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove duplicate lineJon Skeet2016-03-311-1/+0
| * | | | Introduce a new nuget package, Google.Protobuf.Tools, basically to contain pr...Jon Skeet2016-03-312-14/+38
* | | | | Merge pull request #1371 from keveman/oversize_protosJoshua Haberman2016-03-312-11/+94
|\ \ \ \ \
| * | | | | Added an API to allow oversize protos when using C++ extension in PythonManjunath Kudlur2016-03-312-11/+94
* | | | | | Merge pull request #1366 from xyzzyz/int128_ostreamFeng Xiao2016-03-311-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Replace #include <iostream> with #include <ostream>Adam Michalik2016-03-301-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1362 from jskeet/tweak_json_nameJan Tattermusch2016-03-301-61/+39
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Refactoring of FieldDescriptorJon Skeet2016-03-301-61/+39
| |/ / /
* | | | Merge pull request #1360 from pherl/masterJisi Liu2016-03-301-1/+1
|\ \ \ \
| * | | | Use the T() instead of NULL for the default value.Jisi Liu2016-03-291-1/+1
* | | | | Merge pull request #1295 from haberman/dockerJoshua Haberman2016-03-309-36/+448
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'master' into dockerJosh Haberman2016-03-29101-6889/+4074
| |\| | |
| * | | | Rearranged and commented files for running under Jenkins.Josh Haberman2016-03-0411-140/+115
| * | | | Disable attempt to use ccache for docker build.Josh Haberman2016-03-033-20/+13
| * | | | Properly report C++ build time.Josh Haberman2016-03-033-8/+15
| * | | | Use a local Maven repository to avoid network fetches during tests.Josh Haberman2016-03-032-0/+31
| * | | | Make Java copy into separate directories so the tests can run concurrently.Josh Haberman2016-03-021-5/+9
| * | | | Added code to generate XML output file for more granular results.Josh Haberman2016-03-025-11/+122
| * | | | Added Ruby 2.1, Oracle Java, and C#.Josh Haberman2016-03-023-21/+76
| * | | | Upgrade Python packages using pip.Josh Haberman2016-03-021-1/+7