Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Introduce ICustomDiagnosticMessage to allow for custom string formatting | Jon Skeet | 2016-01-13 | 7 | -1/+142 |
| | | | | This fixes issue #933, effectively. | ||||
* | Merge pull request #1089 from jskeet/map-null | Jan Tattermusch | 2016-01-12 | 14 | -176/+168 |
|\ | | | | | Prohibit null values in maps | ||||
| * | Prohibit null values in map fields | Jon Skeet | 2016-01-11 | 14 | -176/+168 |
| | | | | | | | | | | On deserialization, missing values for message types are replaced with a "default" message. | ||||
* | | Merge pull request #1080 from haberman/conformance-crashes | Joshua Haberman | 2016-01-12 | 14 | -59/+861 |
|\ \ | | | | | | | Allow conformance test runner to tolerate crashes, and re-enable conformance tests | ||||
| * | | Don't generate Objective C WKT for conformance tests to avoid dupliate defs. | Josh Haberman | 2016-01-12 | 1 | -6/+11 |
| | | | |||||
| * | | Conformance: Update C# failure list to reflect which tests currently pass. | Josh Haberman | 2016-01-12 | 1 | -89/+2 |
| | | | |||||
| * | | Fixed Ruby conformance tests by running them under rvm Ruby. | Josh Haberman | 2016-01-11 | 3 | -5/+4 |
| | | | |||||
| * | | Added debugging output to debug type= problem on Travis. | Josh Haberman | 2016-01-11 | 2 | -2/+3 |
| | | | |||||
| * | | Updated C#'s failure list, and added missing file. | Josh Haberman | 2016-01-11 | 3 | -0/+179 |
| | | | |||||
| * | | Allow conformance test runner to tolerate crashes, and re-enable conformance ↵ | Josh Haberman | 2016-01-11 | 12 | -55/+760 |
| | | | | | | | | | | | | tests. | ||||
* | | | Merge pull request #1129 from dongjoon-hyun/fix_typos_in_README_and_CHANGES | Feng Xiao | 2016-01-12 | 5 | -17/+17 |
|\ \ \ | | | | | | | | | Fix typos in README.md/CHANGES.txt | ||||
| * | | | Fix typos in README.md/CHANGES.txt | Dongjoon Hyun | 2016-01-11 | 5 | -17/+17 |
| |/ / | |||||
* | | | Merge pull request #1131 from thomasvl/fix_sem_leak | Thomas Van Lenten | 2016-01-12 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Release the semaphore in dealloc, fixing leak. | ||||
| * | | Release the semaphore in dealloc, fixing leak. | Thomas Van Lenten | 2016-01-12 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #1046 from peternewman/patch-1 | Feng Xiao | 2016-01-11 | 1 | -2/+1 |
|\ \ | |/ |/| | Add the docs claimed define for HAVE_UNORDERED_MAP | ||||
| * | Revert the change and remove an incorrect comment | Peter Newman | 2016-01-09 | 1 | -5/+1 |
| | | |||||
| * | Add the docs claimed define for HAVE_UNORDERED_MAP | Peter Newman | 2015-12-15 | 1 | -0/+3 |
| | | | | | | Make the code match what the docs claimed, to return a define for HAVE_UNORDERED_MAP | ||||
* | | Merge pull request #1124 from xfxyjwf/appveyor | Feng Xiao | 2016-01-09 | 1 | -1/+1 |
|\ \ | | | | | | | Fix appveyor build. | ||||
| * | | Fix appveyor build. | Feng Xiao | 2016-01-09 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1098 from jskeet/wkt-json | Jan Tattermusch | 2016-01-08 | 3 | -63/+55 |
|\ \ | | | | | | | Ensure all formatted well-known-type values are valid JSON | ||||
| * | | Ensure all formatted well-known-type values are valid JSON | Jon Skeet | 2016-01-06 | 3 | -63/+55 |
| | | | | | | | | | | | | | | | | | | | | | This involves quoting timestamp/duration/field-mask values, even when they're not in fields. It's better for consistency. Fixes issue #1097. | ||||
* | | | Merge pull request #1088 from jskeet/codec-pruning | Jan Tattermusch | 2016-01-08 | 1 | -5/+0 |
|\ \ \ | | | | | | | | | Remove unused method in FieldCodec. | ||||
| * | | | Remove unused method in FieldCodec. | Jon Skeet | 2016-01-05 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | (The method was last used a very long time ago, if ever.) | ||||
* | | | | Merge pull request #1087 from jskeet/json-tests | Jan Tattermusch | 2016-01-08 | 2 | -51/+91 |
|\ \ \ \ | | | | | | | | | | | Improve number handling in JSON parsing | ||||
| * | | | | Improve number handling in JSON parsing | Jon Skeet | 2016-01-06 | 2 | -51/+91 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | - Tighten up on Infinity/NaN handling in terms of whitespace handling (and test casing) - Validate that values are genuinely integers when they've been parsed from a JSON number (ignoring the fact that 1.0000000000000000001 == 1 as a double...) - Allow exponents and decimal points in string representations | ||||
* | | | | Merge pull request #1120 from gitplaneta/master | Feng Xiao | 2016-01-08 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Update README.md - remove typo | ||||
| * | | | | Update README.md - remove typo | Radoslaw Busz | 2016-01-08 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1101 from xfxyjwf/doc | Feng Xiao | 2016-01-07 | 3 | -243/+30 |
|\ \ \ \ | | | | | | | | | | | Update README.md and remove INSTALL.txt | ||||
| * | | | | Update README.md and remove INSTALL.txt | Feng Xiao | 2016-01-06 | 3 | -243/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added instructions on what tools to install to compile protobuf from source. Removed the INSTALL.txt file because it's just a simple copy of the autoconf documentation and confuses users. Change-Id: I6fd8aa13495f1238fe5c62451b95ad480b1c4bed | ||||
* | | | | | Merge pull request #1118 from thomasvl/xcode_scheme_cleanup | Thomas Van Lenten | 2016-01-07 | 2 | -6/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | Remove the stale reference to test no longer around, and keep the performance test limited to just performance tests. | ||||
| * | | | | Remove the stale reference to test no longer around, and keep the ↵ | Thomas Van Lenten | 2016-01-07 | 2 | -6/+6 |
|/ / / / | | | | | | | | | | | | | performance test limited to just performance tests. | ||||
* | | | | Patch internal change 111557819. | Feng Xiao | 2016-01-06 | 6 | -4/+179 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defer calls to mutable_unknown_fields() until it is actually required to save memory for C++ lite runtime. Change-Id: Ica9c1fd276cdb164942d1e7b6e098c83ee3ffdc5 | ||||
* | | | | Merge pull request #1100 from xfxyjwf/javadoc | Feng Xiao | 2016-01-06 | 3 | -6/+6 |
|\ \ \ \ | | | | | | | | | | | Update version number and fix javadoc errors. | ||||
| * | | | | Update version number and fix javadoc errors. | Feng Xiao | 2016-01-06 | 3 | -6/+6 |
| | | | | | |||||
* | | | | | Merge pull request #1094 from thomasvl/update_objc_conformance | Thomas Van Lenten | 2016-01-06 | 3 | -108/+16 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fix up the conformance tests | ||||
| * | | | | Fix up the conformance tests | Thomas Van Lenten | 2016-01-05 | 3 | -108/+16 |
|/ / / / | | | | | | | | | | | | | | | | | - Update all the new runner cases to handle a skip result as a skip and not a failure. - Make ObjC use the new serialize_error result if it fails to generate the data. | ||||
* | | | | Merge pull request #1093 from thomasvl/fix_objc | Thomas Van Lenten | 2016-01-05 | 1 | -0/+13 |
|\ \ \ \ | | | | | | | | | | | Update objectivec/google/protobuf/Type.pbobjc.m | ||||
| * | | | | Update objectivec/google/protobuf/Type.pbobjc.m | Thomas Van Lenten | 2016-01-05 | 1 | -0/+13 |
|/ / / / | | | | | | | | | | | | | | | | | commit e841bac4fcf47f809e089a70d5f84ac37b3883df seems to have updated the generated .pbobjc.h but not the .pbobjc.m to match. | ||||
* | | | | Merge pull request #1092 from thomasvl/fix_conformance | Thomas Van Lenten | 2016-01-05 | 1 | -3/+0 |
|\ \ \ \ | | | | | | | | | | | Fix conformance test to only report skips in verbose mode. | ||||
| * | | | | Fix conformance test to only report skips in verbose mode. | Thomas Van Lenten | 2016-01-05 | 1 | -3/+0 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | commit e841bac4fcf47f809e089a70d5f84ac37b3883df seems to have mis-merged the change to reporting skipped tests. I didn't check if there were other merge issues. | ||||
* | | | | Merge pull request #1091 from thomasvl/objc_tests_use_autocreators | Thomas Van Lenten | 2016-01-05 | 4 | -13/+1 |
|\ \ \ \ | | | | | | | | | | | Have the tests rely on the autocreator behaviors. | ||||
| * | | | | Have the tests rely on the autocreator behaviors. | Thomas Van Lenten | 2016-01-05 | 4 | -13/+1 |
|/ / / / | | | | | | | | | | | | | | | | | Incase developers look at the tests for examples, have them rely on the autocreators also. | ||||
* | | | | Merge pull request #1085 from jskeet/fix-generation | Jon Skeet | 2016-01-05 | 2 | -125/+1301 |
|\ \ \ \ | | |/ / | |/| | | Fix C# source generation shell script and remove out of date notes | ||||
| * | | | Fix C# source generation shell script and remove out of date notes | Jon Skeet | 2016-01-04 | 2 | -125/+1301 |
|/ / / | | | | | | | | | | | | | The conformance tests now use types which are part of src/google/protobuf, so we need to include src in the proto path. The notes around "fix-ups" have been out of date for some time now. | ||||
* | | | Merge pull request #1081 from haberman/fix-py3 | Joshua Haberman | 2015-12-31 | 3 | -91/+152 |
|\ \ \ | |/ / |/| | | Fixes for Python 3. | ||||
| * | | Fixed compile for Python 3. There are still some crashes though. | Josh Haberman | 2015-12-30 | 3 | -91/+152 |
|/ / | |||||
* | | Add changelog for v3.0.0-beta-2.v3.0.0-beta-2 | Feng Xiao | 2015-12-30 | 1 | -0/+61 |
| | | | | | | | | | | | | [skip ci] Change-Id: Id383944dd3c999ad1008345ef34c9bdae24abc7c | ||||
* | | Fix for Visual Studio 2008. | Feng Xiao | 2015-12-30 | 4 | -35/+27 |
| | | |||||
* | | Require six>=1.9 for Python. | Feng Xiao | 2015-12-29 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | We use six sub-modules that aren't available in old versions. Not specifying this requirement in the setup will lead to much less readable runtime errors. It's particuarlly problematic for Mac OSX users because the system comes with an old six version 1.4.1 by default. [skip ci] | ||||
* | | Update BUILD/cmake files. | Feng Xiao | 2015-12-28 | 3 | -3/+9 |
| | | | | | | | | Change-Id: I6fa9f1b65d6c06b891aabf3f3d868364d74d727d |