aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make protobuf Skylark extension appends the workspace rootDamien Martin-Guillerez2016-01-151-6/+10
* Merge pull request #1121 from nmittler/restructureFeng Xiao2016-01-13146-432/+516
|\
| * Restructuring protobuf to multiple modulesnmittler2016-01-13146-432/+516
* | Merge pull request #1089 from jskeet/map-nullJan Tattermusch2016-01-1214-176/+168
|\ \
| * | Prohibit null values in map fieldsJon Skeet2016-01-1114-176/+168
* | | Merge pull request #1080 from haberman/conformance-crashesJoshua Haberman2016-01-1214-59/+861
|\ \ \
| * | | Don't generate Objective C WKT for conformance tests to avoid dupliate defs.Josh Haberman2016-01-121-6/+11
| * | | Conformance: Update C# failure list to reflect which tests currently pass.Josh Haberman2016-01-121-89/+2
| * | | Fixed Ruby conformance tests by running them under rvm Ruby.Josh Haberman2016-01-113-5/+4
| * | | Added debugging output to debug type= problem on Travis.Josh Haberman2016-01-112-2/+3
| * | | Updated C#'s failure list, and added missing file.Josh Haberman2016-01-113-0/+179
| * | | Allow conformance test runner to tolerate crashes, and re-enable conformance ...Josh Haberman2016-01-1112-55/+760
* | | | Merge pull request #1129 from dongjoon-hyun/fix_typos_in_README_and_CHANGESFeng Xiao2016-01-125-17/+17
|\ \ \ \
| * | | | Fix typos in README.md/CHANGES.txtDongjoon Hyun2016-01-115-17/+17
| |/ / /
* | | | Merge pull request #1131 from thomasvl/fix_sem_leakThomas Van Lenten2016-01-121-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Release the semaphore in dealloc, fixing leak.Thomas Van Lenten2016-01-121-0/+1
|/ / /
* | | 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