aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3429 from king6cong/masterFeng Xiao2017-07-312-1/+8
|\
| * Add classpath for java example Makefileking6cong2017-07-312-1/+8
|/
* Merge pull request #3421 from thomasvl/update_commentThomas Van Lenten2017-07-263-5/+9
|\
| * Update the comment on the message_type to cover what it should be.Thomas Van Lenten2017-07-263-5/+9
|/
* Merge pull request #3420 from thomasvl/objc_proto2_conformanceThomas Van Lenten2017-07-263-23/+26
|\
| * Review feedback.Thomas Van Lenten2017-07-261-8/+6
| * Add the proto2 message conformance support for ObjC.Thomas Van Lenten2017-07-261-10/+12
| * Generate the proto2 test file and link it in for ObjC.Thomas Van Lenten2017-07-261-9/+11
| * Add a objc_class_prefix to test_messages_proto3.proto.Thomas Van Lenten2017-07-262-3/+4
|/
* Merge pull request #3410 from adam-26/1745Adam Cozzette2017-07-251-0/+1
|\
| * Fix quotation marksAdam2017-07-241-1/+1
| * Fix issue #1745 - javascript allow dot in filenameAdam2017-07-241-0/+1
* | need for php math functions. used in mergeFromJsonString (#3409)Sergey2017-07-251-0/+3
* | Merge pull request #3407 from bklarson/masterAdam Cozzette2017-07-2515-1/+29
|\ \
| * | Put AddDescriptorsImpl() in anonymous namespaceBrad Larson2017-07-2414-0/+28
| * | Add -Werror=missing-declarations to test buildsBrad Larson2017-07-241-1/+1
* | | Fix cycle dependency for repeated field not collected by gc (#3399)Paul Yang2017-07-258-64/+243
* | | Merge pull request #3281 from BSBandme/ConformanceTestYilunChongYilun Chong2017-07-2427-1073/+1523
|\ \ \ | |_|/ |/| |
| * | add comments in makefile.amYilun Chong2017-07-051-1/+2
| * | change csharp failure listYilun Chong2017-07-051-4/+1
| * | Merge branch 'ConformanceTestYilunChong' of github.com:BSBandme/protobuf into...Yilun Chong2017-07-05113-3446/+5297
| |\ \
| | * \ Merge branch 'master' into ConformanceTestYilunChongYilun Chong2017-06-30113-3446/+5297
| | |\ \
| * | | | delete backup filesYilun Chong2017-07-051-155/+0
| * | | | fix php failing list and csharp generated protoYilun Chong2017-07-054-213/+370
| |/ / /
| * | | changed php's failing listYilun Chong2017-06-302-534/+11
| * | | remove backup filesYilun Chong2017-06-303-438/+0
| * | | add some test proto2 supported, add js proto2 supported, fixed some errorYilun Chong2017-06-3025-1230/+1742
| * | | change php objc nodejs csharp rubyYilun Chong2017-06-296-31/+30
| * | | change java to uniform message, revert TestValidDataForType's parametersYilun Chong2017-06-293-318/+147
| * | | change cpp and python to uniform messageYilun Chong2017-06-293-102/+67
| * | | fix csharp conformance testYilun Chong2017-06-281-1/+1
| * | | fix csharp conformance testYilun Chong2017-06-281-16/+16
| * | | fix csharpYilun Chong2017-06-281-15/+15
| * | | add csharp supportYilun Chong2017-06-282-12/+57
| * | | add message set test caseYilun Chong2017-06-282-0/+21
| * | | add objec supportYilun Chong2017-06-281-6/+14
| * | | revert ruby proto built filesYilun Chong2017-06-2812-396/+0
| * | | delete backup filesYilun Chong2017-06-283-385/+0
| * | | delete binaryYilun Chong2017-06-2810-0/+0
| * | | update .gitignoreYilun Chong2017-06-281-0/+1
| * | | revert .gitignoreYilun Chong2017-06-281-1/+0
| * | | add java supportedYilun Chong2017-06-2811-17/+184
| * | | change ignoreYilun Chong2017-06-271-0/+1
| * | | add proto2 supported for cpp,python,nodejs,ruby,phpYilun Chong2017-06-2732-32/+893
| * | | add support for proto2Yilun Chong2017-06-265-87/+142
| * | | fix readme.mdYilun Chong2017-06-231-1/+1
| * | | add test_proto2_message.proto and change conformnace/makefile.amYilun Chong2017-06-233-7/+213
* | | | Merge pull request #2969 from laszlocsomor/masterFeng Xiao2017-07-2419-81/+970
|\ \ \ \ | |_|_|/ |/| | |
| * | | Windows: support long pathsLaszlo Csomor2017-07-1119-81/+970
* | | | Merge pull request #3403 from ax3l/topic-cmake-pkgconfigAdam Cozzette2017-07-244-0/+30
|\ \ \ \