aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Detect invalid tags with a field number of 0 in C#Jon Skeet2017-08-113-7/+16
* Merge pull request #3480 from bklarson/masterFeng Xiao2017-08-101-21/+14
|\
| * Clean up typedefs for Atomic32/Atomic64Brad Larson2017-08-101-21/+14
|/
* Merge pull request #3473 from AlanBurlison/masterFeng Xiao2017-08-081-1/+1
|\
| * PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLongalanbur2017-08-081-1/+1
* | Merge pull request #3467 from thomasvl/bump_xcode_versionThomas Van Lenten2017-08-082-4/+2
|\ \ | |/ |/|
| * Move travis to the Xcode 8.3 (8.3.3) image.Thomas Van Lenten2017-08-071-1/+1
| * Fix up Xcode 8.3.x support.Thomas Van Lenten2017-08-071-3/+1
* | Merge pull request #3454 from anandolee/masterJie Luo2017-08-074-8/+16
|\ \
| * | PY26 tests compatibilityJie Luo2017-08-042-4/+12
| * | Skip setUpClass which is newly added in python2.7 for python2.6Jie Luo2017-08-041-2/+3
| * | Add python 2.6 test back for cpp implementation. Json format issue was fixed ...Jie Luo2017-08-031-2/+1
* | | Merge pull request #3465 from vladmos/list_plus_equalsFeng Xiao2017-08-071-3/+3
|\ \ \
| * | | Make .bzl files compatible with future versions of BazelVladimir Moskva2017-08-071-3/+3
|/ / /
* | | Update commit id in Dockerfile to reflect change in #3391 (#3459)Paul Yang2017-08-042-2/+2
* | | Fix the bug in php c extension that setting one field can change anotherĀ fie...Paul Yang2017-08-047-33/+95
* | | Update PHP descriptors (#3391)michaelbausor2017-08-0417-21/+617
* | | Merge pull request #3456 from giorgioazzinnaro/patch-1Feng Xiao2017-08-041-0/+1
|\ \ \
| * | | Update third party addons with ProfaneDBGiorgio Azzinnaro2017-08-041-0/+1
|/ / /
* | | Add getClass for php Descriptor in c extension (#3443)Paul Yang2017-08-023-1/+16
* | | Fixing HHVM Compatibility (#3437)Ryan Gordon2017-08-021-4/+2
* | | Expose descriptor API in php c extension (#3422)Paul Yang2017-08-028-27/+841
* | | Change divideInt64ToInt32 to static (#3436)Tony Wong2017-08-011-1/+1
* | | Removes unnecessary pass-by-references in PHP internal classes (#3433)Brent Shaffer2017-08-013-10/+10
* | | 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