aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow conformance test runner to tolerate crashes, and re-enable conformance ...Josh Haberman2016-01-1112-55/+760
* Merge pull request #1046 from peternewman/patch-1Feng Xiao2016-01-111-2/+1
|\
| * Revert the change and remove an incorrect commentPeter Newman2016-01-091-5/+1
| * Add the docs claimed define for HAVE_UNORDERED_MAPPeter Newman2015-12-151-0/+3
* | Merge pull request #1124 from xfxyjwf/appveyorFeng Xiao2016-01-091-1/+1
|\ \
| * | Fix appveyor build.Feng Xiao2016-01-091-1/+1
|/ /
* | Merge pull request #1098 from jskeet/wkt-jsonJan Tattermusch2016-01-083-63/+55
|\ \
| * | Ensure all formatted well-known-type values are valid JSONJon Skeet2016-01-063-63/+55
* | | Merge pull request #1088 from jskeet/codec-pruningJan Tattermusch2016-01-081-5/+0
|\ \ \
| * | | Remove unused method in FieldCodec.Jon Skeet2016-01-051-5/+0
* | | | Merge pull request #1087 from jskeet/json-testsJan Tattermusch2016-01-082-51/+91
|\ \ \ \
| * | | | Improve number handling in JSON parsingJon Skeet2016-01-062-51/+91
| | |/ / | |/| |
* | | | Merge pull request #1120 from gitplaneta/masterFeng Xiao2016-01-081-1/+1
|\ \ \ \
| * | | | Update README.md - remove typoRadoslaw Busz2016-01-081-1/+1
|/ / / /
* | | | Merge pull request #1101 from xfxyjwf/docFeng Xiao2016-01-073-243/+30
|\ \ \ \
| * | | | Update README.md and remove INSTALL.txtFeng Xiao2016-01-063-243/+30
* | | | | Merge pull request #1118 from thomasvl/xcode_scheme_cleanupThomas Van Lenten2016-01-072-6/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove the stale reference to test no longer around, and keep the performance...Thomas Van Lenten2016-01-072-6/+6
|/ / / /
* | | | Patch internal change 111557819.Feng Xiao2016-01-066-4/+179
* | | | Merge pull request #1100 from xfxyjwf/javadocFeng Xiao2016-01-063-6/+6
|\ \ \ \
| * | | | Update version number and fix javadoc errors.Feng Xiao2016-01-063-6/+6
* | | | | Merge pull request #1094 from thomasvl/update_objc_conformanceThomas Van Lenten2016-01-063-108/+16
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix up the conformance testsThomas Van Lenten2016-01-053-108/+16
|/ / / /
* | | | Merge pull request #1093 from thomasvl/fix_objcThomas Van Lenten2016-01-051-0/+13
|\ \ \ \
| * | | | Update objectivec/google/protobuf/Type.pbobjc.mThomas Van Lenten2016-01-051-0/+13
|/ / / /
* | | | Merge pull request #1092 from thomasvl/fix_conformanceThomas Van Lenten2016-01-051-3/+0
|\ \ \ \
| * | | | Fix conformance test to only report skips in verbose mode.Thomas Van Lenten2016-01-051-3/+0
|/ / / /
* | | | Merge pull request #1091 from thomasvl/objc_tests_use_autocreatorsThomas Van Lenten2016-01-054-13/+1
|\ \ \ \
| * | | | Have the tests rely on the autocreator behaviors.Thomas Van Lenten2016-01-054-13/+1
|/ / / /
* | | | Merge pull request #1085 from jskeet/fix-generationJon Skeet2016-01-052-125/+1301
|\ \ \ \ | | |/ / | |/| |
| * | | Fix C# source generation shell script and remove out of date notesJon Skeet2016-01-042-125/+1301
|/ / /
* | | Merge pull request #1081 from haberman/fix-py3Joshua Haberman2015-12-313-91/+152
|\ \ \ | |/ / |/| |
| * | Fixed compile for Python 3. There are still some crashes though.Josh Haberman2015-12-303-91/+152
|/ /
* | Add changelog for v3.0.0-beta-2.v3.0.0-beta-2Feng Xiao2015-12-301-0/+61
* | Fix for Visual Studio 2008.Feng Xiao2015-12-304-35/+27
* | Require six>=1.9 for Python.Feng Xiao2015-12-292-2/+2
* | Update BUILD/cmake files.Feng Xiao2015-12-283-3/+9
* | Fix a misplaced macro.Feng Xiao2015-12-281-5/+5
* | Add js to post_process_dist.sh.Feng Xiao2015-12-281-1/+1
* | Fix a compiler warning.Feng Xiao2015-12-281-0/+2
* | Add missing files to EXTRA_DIST.Feng Xiao2015-12-2810-279/+83
* | Merge pull request #1071 from haberman/js-testsFeng Xiao2015-12-288-1/+135
|\ \
| * | Fixed test command for JS tests.Josh Haberman2015-12-281-1/+1
| * | Fixed version number and testing command.Josh Haberman2015-12-221-2/+2
| * | Added README and enabled JavaScript tests on Node.jsJosh Haberman2015-12-218-1/+135
|/ /
* | Disable python conformnace tests as well.Feng Xiao2015-12-211-2/+4
* | Fix Python 2.6 test failures.Feng Xiao2015-12-211-1/+5
* | Disable conformance tests for csharp and ruby.Feng Xiao2015-12-212-4/+8
* | Update version numbers.Feng Xiao2015-12-214-4/+4
* | Build Java conformance tests for JDK7 only.Feng Xiao2015-12-211-1/+9