aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* update to Guava 20Elliotte Rusty Harold2018-09-071-1/+1
* Add source dependency of test suite implementation to main function (#5069)Paul Yang2018-09-064-230/+202
* Merge pull request #5103 from haberman/cmakeJoshua Haberman2018-09-021-0/+1
|\
| * Added conformance test impl file to CMake.Joshua Haberman2018-09-021-0/+1
* | Merge pull request #5099 from oqton/feature/issue-5806Feng Xiao2018-09-023-1/+41
|\ \ | |/ |/|
| * Also make sure known fields come across as expectedBrandon Cole2018-08-301-1/+6
| * Code fixes for the original unit test.Brandon Cole2018-08-302-1/+18
| * Add unit test for loading unknown fields in Any messagesBrandon Cole2018-08-301-0/+18
* | Merge pull request #5078 from haberman/conformance-cmakeJoshua Haberman2018-09-023-0/+53
|\ \
| * | Added missing file to Makefile.am.Josh Haberman2018-08-241-0/+1
| * | Added cmake build files for the conformance test runner.Josh Haberman2018-08-242-0/+52
* | | Merge pull request #5092 from xfxyjwf/contribFeng Xiao2018-09-011-0/+85
|\ \ \
| * | | Add constributing guidelines.Feng Xiao2018-08-291-0/+85
| | |/ | |/|
* | | Fix well known type class not inheriting Message (#5095)Paul Yang2018-08-312-2/+4
* | | Add missing reference to conformanc_test_impl.cc in Makefile (#5100)Paul Yang2018-08-313-2/+7
* | | Merge pull request #5082 from elharo/guavaFeng Xiao2018-08-291-2/+2
|\ \ \
| * | | update versionElliotte Harold2018-08-271-2/+2
| |/ /
* | | Merge pull request #5079 from GobySoft/request-new-extensionFeng Xiao2018-08-291-2/+8
|\ \ \
| * | | Update options.mdToby Schneider2018-08-241-2/+8
| |/ /
* | | Merge pull request #5077 from EmersonGaziz/patch-1Feng Xiao2018-08-291-1/+1
|\ \ \ | |/ / |/| |
| * | Update options.md | fix website url for C# portGohar Aziz2018-08-241-1/+1
|/ /
* | Merge pull request #5074 from xfxyjwf/linksFeng Xiao2018-08-233-4/+4
|\ \
| * | Fix go tests.Feng Xiao2018-08-231-1/+1
| * | Revert changed links in Dockerfiles.Feng Xiao2018-08-232-3/+3
|/ /
* | Merge pull request #5068 from xfxyjwf/linksFeng Xiao2018-08-2252-84/+84
|\ \
| * | Replace repo links.Feng Xiao2018-08-2252-84/+84
|/ /
* | Support creating FileDescriptors dynamically from binary data.Jon Skeet2018-08-206-40/+168
* | Merge pull request #5024 from greenhouse-org/fix-windows-pathFeng Xiao2018-08-201-1/+2
|\ \
| * | Always spilt on '\' and '/'Sam Smith2018-08-131-5/+1
| * | Fix TryCreateParentDirectory on WindowsSam Smith2018-08-091-0/+5
* | | Merge pull request #5050 from lucidsoftware/lucidFeng Xiao2018-08-201-1/+1
|\ \ \
| * | | Change deprecated Bazel single file attr paramJames Judd2018-08-141-1/+1
|/ / /
* | | Disable surrogate check for ucs2 (#5039)Jie Luo2018-08-142-3/+10
* | | Merge pull request #5042 from dsnet/masterFeng Xiao2018-08-131-0/+5
|\ \ \
| * | | Document wrapper non-usesJoe Tsai2018-08-131-0/+5
|/ / /
* | | Merge pull request #5033 from xfxyjwf/upFeng Xiao2018-08-131-1/+1
|\ \ \
| * | | Fix issues discovered in up-integration.Feng Xiao2018-08-131-1/+1
* | | | Merge pull request #5041 from xfxyjwf/bazelFeng Xiao2018-08-132-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add status badge for bazel build.Feng Xiao2018-08-132-2/+2
|/ / /
* | | Merge pull request #5040 from xfxyjwf/bazelFeng Xiao2018-08-134-2/+11
|\ \ \
| * | | Update build files.Feng Xiao2018-08-134-2/+11
|/ / /
* | | Merge pull request #5038 from xfxyjwf/proto2Feng Xiao2018-08-1338-124/+125
|\ \ \
| * | | Down-integrate proto2 namespace fix.Feng Xiao2018-08-1338-124/+125
* | | | Merge pull request #5032 from TeBoring/json-wrapperJoshua Haberman2018-08-133-221/+589
|\ \ \ \ | |/ / / |/| | |
| * | | Fix json parsing of wrapper valuesBo Yang2018-08-103-221/+589
* | | | Merge pull request #4951 from BSBandme/add_js_benchmarkYilun Chong2018-08-106-2/+266
|\ \ \ \
| * | | | fix filename and newlineYilun Chong2018-08-085-12/+15
| * | | | Add JS and Protobuf.js benchmarkYilun Chong2018-07-206-2/+263
* | | | | Fix failing tests.Feng Xiao2018-08-0922-34/+728
* | | | | Merge remote-tracking branch 'google/master' into integration_baseintegration_baseFeng Xiao2018-08-094-64/+7
|\ \ \ \ \