aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Refactor README.md.Feng Xiao2016-01-212-186/+254
* Merge pull request #1163 from jskeet/more-jsonJan Tattermusch2016-01-211-2/+2
|\
| * Fix mistakes in highest-representable float64 integersJon Skeet2016-01-211-2/+2
* | Merge pull request #1162 from brian-peloton/masterFeng Xiao2016-01-211-2/+2
|\ \ | |/ |/|
| * Avoid upcasting uninitialized pointersBrian Silverman2016-01-201-2/+2
|/
* Merge pull request #789 from motahan/solaris64_fixFeng Xiao2016-01-204-13/+13
|\
| * Fixing compile errors on Solaris in 64-bit modeMohamed El-Tahan2015-09-024-13/+13
* | Merge pull request #1096 from jskeet/custom-to-stringJan Tattermusch2016-01-197-1/+142
|\ \
| * | Introduce ICustomDiagnosticMessage to allow for custom string formattingJon Skeet2016-01-137-1/+142
* | | Merge pull request #1155 from jcburke14/jb-intcastFeng Xiao2016-01-191-1/+1
|\ \ \
| * | | Fix compiler warning from repeated_field.hJohn Burke2016-01-191-1/+1
|/ / /
* | | Merge pull request #1147 from jcanizales/patch-1Feng Xiao2016-01-191-1/+1
|\ \ \
| * | | Update podspec version to 3.0.0-beta-2Jorge Canizales2016-01-151-1/+1
* | | | Merge pull request #896 from jhump/jh/fix-ioexception-vs-invalidprotobuf-exce...Feng Xiao2016-01-166-14/+300
|\ \ \ \
| * | | | move test file (was in wrong place after rebasing on java module refactor)Joshua Humphries2016-01-151-0/+0
| * | | | fully qualify invocations of static methods on GeneratedMessageJoshua Humphries2016-01-151-6/+6
| * | | | throw IOException instead of InvalidProtocolBufferException when appropriateJoshua Humphries2016-01-156-14/+300
| |/ / /
* | | | Merge pull request #1145 from jskeet/conformanceJon Skeet2016-01-1617-233/+537
|\ \ \ \
| * | | | Fix broken testJon Skeet2016-01-151-1/+1
| * | | | Remove now-fixed conformance errors.Jon Skeet2016-01-151-73/+0
| * | | | Make sure thatJon Skeet2016-01-154-8/+70
| * | | | Reject JSON containing the same oneof field twiceJon Skeet2016-01-152-0/+22
| * | | | Change handling of unknown enums: we now write out the value as a number.Jon Skeet2016-01-154-36/+23
| * | | | Extra strictness for FieldMask conversionJon Skeet2016-01-154-2/+51
| * | | | Allow the original field name (rather than camel-cased) when parsing JSONJon Skeet2016-01-152-3/+23
| * | | | Fixes to JSON timestamp/duration representationsJon Skeet2016-01-158-35/+139
| * | | | Report serialization errors in conformance testsJon Skeet2016-01-151-8/+15
| * | | | Prohibit null values in repeated and map fields in JSONJon Skeet2016-01-152-1/+38
| * | | | Throw a better exception when invalid base64 is detected in JSONJon Skeet2016-01-153-1/+28
| * | | | Support (and test) numeric enum parsing in JSONJon Skeet2016-01-152-0/+29
| * | | | Fix handling of repeated wrappersJon Skeet2016-01-153-77/+94
| * | | | JSON conformance test fixesJon Skeet2016-01-133-0/+16
| | |/ / | |/| |
* | | | Merge pull request #1146 from haberman/pycppfixJoshua Haberman2016-01-153-181/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixed Python 3.x C++ build, and updated conformance failure lists.Josh Haberman2016-01-153-181/+5
* | | | Merge pull request #1143 from xfxyjwf/fix_javaFeng Xiao2016-01-152-156/+158
|\ \ \ \ | |/ / / |/| | |
| * | | Fix tests broken by the Java directory change.Feng Xiao2016-01-142-156/+158
|/ / /
* | | 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
|\ \ \ \ \ | |/ / / / |/| | | |