aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3461 from TeBoring/3.4.xv3.4.0rc1Jisi Liu2017-08-0746-126/+1627
|\
| * Merge branch 'master' into 3.4.xBo Yang2017-08-0546-126/+1627
| |\
| | * 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
* | | | Merge pull request #3468 from vladmos/3.4.xFeng Xiao2017-08-071-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Make .bzl files compatible with future versions of BazelVladimir Moskva2017-08-071-3/+3
|/ / /
* | | Merge pull request #3450 from pherl/invalidoffsetJisi Liu2017-08-0315-144/+315
|\ \ \
| * | | Fix invalid offsetof warning.Jisi Liu2017-08-0315-144/+315
* | | | Merge pull request #3451 from pherl/fixtypoJisi Liu2017-08-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typo.Jisi Liu2017-08-031-1/+1
|/ / /
* | | Add destructors for default instances to the shutdown code.Gerben Stavenga2017-08-0216-73/+152
* | | Merge pull request #3442 from pherl/csharpversionJisi Liu2017-08-021-1/+1
|\ \ \
| * | | Bump csharp versionJisi Liu2017-08-021-1/+1
* | | | Merge pull request #3438 from pherl/changelogJisi Liu2017-08-021-0/+128
|\| | |
| * | | Update change logJisi Liu2017-08-011-0/+128
* | | | Merge pull request #3419 from pherl/3.4.xJisi Liu2017-08-0185-1295/+3022
|\| | |
| * | | remove the duplicationJisi Liu2017-08-011-1/+0
| * | | Adding the missing headerJisi Liu2017-08-011-0/+1
| * | | Export functions in io_win32.h in win DLL buildJisi Liu2017-08-011-13/+14
| * | | Update conformance tests again.Jisi Liu2017-07-253-3/+4
| * | | Fix makefile.amJisi Liu2017-07-253-0/+5
| * | | Fix conformance testsJisi Liu2017-07-252-4/+4
| * | | Fix build filesJisi Liu2017-07-255-7/+3
| * | | Remove dependency on guava 20Jisi Liu2017-07-252-14/+10
| * | | Update conformance testsJisi Liu2017-07-253-5/+6
| * | | Merge remote-tracking branch 'origin/master' into mergeJisi Liu2017-07-252-2/+3
| |\| |
| | * | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-31 11:05:11 +0000