aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch (#4466)Paul Yang2018-04-0214-19/+53
* js message support for jstype string on integers (#4332)Charlie Moad2018-04-021-0/+11
* Merge pull request #4467 from xfxyjwf/errorFeng Xiao2018-04-021-1/+6
|\
| * Improve error message when googletest is missing.Feng Xiao2018-04-021-1/+6
* | Merge pull request #4411 from pravin-dsilva/protobuf-ppc64leFeng Xiao2018-04-023-2/+10
|\ \
| * | Add support for power ppc64lepravin-dsilva2018-03-223-2/+10
* | | Merge pull request #4447 from ejona86/cleaner-protoc-artifactsFeng Xiao2018-04-023-11/+32
|\ \ \
| * | | protoc-artifacts: Use ENTRYPOINT to enable devtoolset-1.1Eric Anderson2018-03-283-2/+17
| * | | protoc-artifacts: Avoid storing temporary files and use fewer layersEric Anderson2018-03-281-7/+11
| * | | protoc-artifacts: Avoid checking out protobuf codeEric Anderson2018-03-282-3/+5
| | |/ | |/|
* | | Merge pull request #4452 from xfxyjwf/docFeng Xiao2018-04-022-71/+85
|\ \ \
| * | | Update instructions about getting protobuf source.Feng Xiao2018-03-292-71/+85
| |/ /
* | | Merge pull request #4464 from thomasvl/includes3Thomas Van Lenten2018-04-0243-40/+1351
|\ \ \ | |/ / |/| |
| * | Don't generate imports for the WKTs unless generating the WKTs.Thomas Van Lenten2018-04-024-8/+21
| * | Add compile test sources for to test include order.Thomas Van Lenten2018-04-0228-0/+1229
| * | Trim imports for bundled generated protos.Thomas Van Lenten2018-04-0213-33/+102
|/ /
* | Merge pull request #4433 from xfxyjwf/licenseFeng Xiao2018-03-281-11/+1
|\ \
| * | Cleanup LICENSE file.Feng Xiao2018-03-261-11/+1
* | | Merge pull request #4445 from xfxyjwf/badgeFeng Xiao2018-03-281-14/+12
|\ \ \
| * | | Add kokoro build status badges.Feng Xiao2018-03-271-14/+12
* | | | Merge pull request #4442 from xfxyjwf/cleanFeng Xiao2018-03-2710-692/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Delete unused directories.Feng Xiao2018-03-2710-692/+0
|/ / /
* | | Merge pull request #4439 from acozzette/remove-atomicops-stubAdam Cozzette2018-03-272-238/+1
|\ \ \
| * | | Updated .gitignore to exclude downloaded gmock/ directoryAdam Cozzette2018-03-271-1/+1
| * | | Removed atomicops.h since it is no longer usedAdam Cozzette2018-03-271-237/+0
|/ / /
* | | Merge pull request #3794 from jskeet/reflectionJan Tattermusch2018-03-274-40/+166
|\ \ \
| * | | Address review commentsJon Skeet2018-03-271-5/+13
| * | | Add extra C# file to Makefile.amJon Skeet2018-03-271-0/+1
| * | | Work around an "old runtime" issue with reflectionJon Skeet2018-03-271-5/+51
| * | | Introduce a compatiblity shim to support .NET 3.5 delegate creationJon Skeet2018-03-272-0/+51
| * | | Change C# reflection to avoid using expression treesJon Skeet2018-03-272-34/+54
|/ / /
* | | Merge pull request #4432 from xfxyjwf/rmnanokokoroFeng Xiao2018-03-266-78/+0
|\ \ \
| * | | Delete javanano kokoro build configs.Feng Xiao2018-03-266-78/+0
| |/ /
* | | Merge pull request #4434 from xfxyjwf/buildstatusFeng Xiao2018-03-261-1/+1
|\ \ \ | |/ / |/| |
| * | Remove broken build status icons.Feng Xiao2018-03-261-1/+1
|/ /
* | Include googletest as a submodule (#3993)Carlos O'Ryan2018-03-2616-120/+82
* | source code info for interpreted options; fix source code info for extension ...Joshua Humphries2018-03-264-68/+748
* | Merge pull request #4431 from xfxyjwf/rmnanoFeng Xiao2018-03-2669-17060/+11
|\ \
| * | Remove javanano.Feng Xiao2018-03-2669-17060/+14
* | | Fixes MSVC compiler warning C4800 "Forcing value to bool 'true' or 'false'" (...Alexey Malov2018-03-262-2/+2
* | | Merge pull request #4395 from stone4774/fixbug_enum2json2Feng Xiao2018-03-265-17/+66
|\ \ \
| * \ \ Merge branch 'master' into fixbug_enum2json2stone47742018-03-22339-14979/+19144
| |\ \ \ | | | |/ | | |/|
| * | | Use the first enum value instead of 0 in DefaultValueObjectWriter::FindEnumDe...stone47742018-03-211-1/+1
| * | | Fix bug: whether always_print_enums_as_ints is true or false, it always print...stone47742018-03-195-17/+66
* | | | Merge pull request #4424 from egorpugin/patch-1Feng Xiao2018-03-261-3/+6
|\ \ \ \
| * | | | Fix missing LIBPROTOC_EXPORT.Egor Pugin2018-03-251-3/+6
|/ / / /
* | | | Merge pull request #4413 from pmuetschard/msvcAdam Cozzette2018-03-231-13/+6
|\ \ \ \
| * | | | Don't assume Windows builds use MSVC.Pascal Muetschard2018-03-221-13/+6
| | |/ / | |/| |
* | | | Merge pull request #4422 from acozzette/ruby-conformanceAdam Cozzette2018-03-231-0/+2
|\ \ \ \
| * | | | Updated Ruby conformance test failure listAdam Cozzette2018-03-231-0/+2