Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #3244 from thomasvl/complete_docs | Thomas Van Lenten | 2017-06-19 | 3 | -2/+25 | |
|\ \ \ \ \ | ||||||
| * | | | | | ObjC: Document the exceptions on some of the writing apis. | Thomas Van Lenten | 2017-06-19 | 3 | -2/+25 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3240 from thomasvl/float_fun | Thomas Van Lenten | 2017-06-19 | 3 | -1/+3 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Raise the number of digits used for floats. | Thomas Van Lenten | 2017-06-16 | 3 | -1/+3 | |
* | | | | | Remove inclusion of ext/json/php_json.h. (#3241) | Jeff Ching | 2017-06-17 | 1 | -1/+0 | |
* | | | | | Merge pull request #3237 from calder/patch-1 | Feng Xiao | 2017-06-16 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Qualify string in java_options.h | Calder Coalson | 2017-06-16 | 1 | -2/+2 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #3236 from buchgr/bazel-links | Feng Xiao | 2017-06-16 | 1 | -0/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | bazel: add bazel symlinks to .gitignore | Jakob Buchgraber | 2017-06-16 | 1 | -0/+3 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #3235 from buchgr/java-target | Feng Xiao | 2017-06-16 | 1 | -1/+2 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | bazel: Make compiled jars java 6 binary compatible. | Jakob Buchgraber | 2017-06-16 | 1 | -1/+2 | |
|/ / / / | ||||||
* | | | | Fix php jenkins test (#3233) | Paul Yang | 2017-06-15 | 3 | -6/+6 | |
* | | | | Fix incorrect function call (#3232) | michaelbausor | 2017-06-15 | 1 | -1/+1 | |
* | | | | Follows proper autoloading standards (#3123) | Brent Shaffer | 2017-06-14 | 16 | -841/+1048 | |
* | | | | Merge pull request #3228 from thomasvl/add_tvos_to_podspec | Thomas Van Lenten | 2017-06-14 | 1 | -0/+1 | |
|\ \ \ \ | ||||||
| * | | | | Add tvOS to the podspec. | Thomas Van Lenten | 2017-06-14 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #3216 from traversaro/patch-1 | Feng Xiao | 2017-06-12 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Export symbols used in inline functions | Silvio Traversaro | 2017-06-12 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #3176 from acozzette/fix-3114 | Adam Cozzette | 2017-06-07 | 1 | -4/+10 | |
|\ \ \ | ||||||
| * | | | Ensure that for Java, imports of .proto files with empty packages works | Adam Cozzette | 2017-06-02 | 1 | -4/+10 | |
* | | | | Merge pull request #3196 from matt-kwong/kokoro | Feng Xiao | 2017-06-07 | 18 | -0/+90 | |
|\ \ \ \ | ||||||
| * | | | | Add continuous testing config files for Kokoro | Matt Kwong | 2017-06-07 | 18 | -0/+90 | |
* | | | | | Merge pull request #3191 from matt-kwong/kokoro | Feng Xiao | 2017-06-06 | 39 | -0/+337 | |
|\| | | | | ||||||
| * | | | | Add MacOS and Linux tests to Kokoro | Matt Kwong | 2017-06-06 | 39 | -0/+337 | |
* | | | | | Merge pull request #3189 from thomasvl/objc_proto3_unknown_fields | Thomas Van Lenten | 2017-06-06 | 3 | -44/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | ObjC: Preserve unknown fields in proto3 syntax files. | Thomas Van Lenten | 2017-06-06 | 3 | -44/+5 | |
* | | | | | | Merge pull request #3160 from meteorcloudy/winbuild | Feng Xiao | 2017-06-06 | 1 | -12/+32 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Refactor cc options in BUILD file for Windows | Yun Peng | 2017-05-31 | 1 | -12/+32 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #3159 from yeswalrus/new-generate | Adam Cozzette | 2017-06-06 | 3 | -84/+117 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | add protobuf_generate function, allows use of target_sources where available | Walter Gray | 2017-06-02 | 3 | -84/+117 | |
| * | | | | | fix check_and_save_build_option not correctly exporting build options | Walter Gray | 2017-05-30 | 1 | -1/+1 | |
* | | | | | | Merge pull request #3190 from thomasvl/objc_IllegalZeroFieldNum | Thomas Van Lenten | 2017-06-06 | 3 | -10/+41 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Properly error on a tag with field number zero. | Thomas Van Lenten | 2017-06-06 | 3 | -10/+41 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3157 from yeswalrus/fix-version-check | Adam Cozzette | 2017-06-05 | 1 | -14/+16 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix check_and_save_build_option not correctly exporting build options | Walter Gray | 2017-06-02 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Fix the check_and_save_build_option macro never evaluating to true | Walter Gray | 2017-05-30 | 1 | -1/+1 | |
| * | | | | | Fix find module not working when no version number was given | Walter Gray | 2017-05-30 | 1 | -12/+14 | |
| |/ / / / | ||||||
* | | | | | Add new file option php_namespace. (#3162) | Paul Yang | 2017-06-05 | 42 | -442/+1070 | |
* | | | | | Merge pull request #3169 from dmaclach/master | Thomas Van Lenten | 2017-06-01 | 1 | -1058/+1504 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Optimize GPBDictionary.m codegen to reduce size of overall library by 46K per... | Dave MacLachlan | 2017-06-01 | 1 | -1058/+1504 | |
| |/ / / | ||||||
* | | | | Merge pull request #3170 from thomasvl/int64_map_issue | Thomas Van Lenten | 2017-06-01 | 2 | -1/+6 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fix some cases of reading of 64bit map values. | Thomas Van Lenten | 2017-06-01 | 2 | -1/+6 | |
|/ / / | ||||||
* | | | not to use std::random_device for map.Seed(). (#3133) | Wayne Zhang | 2017-05-30 | 1 | -13/+0 | |
* | | | Merge pull request #3149 from KarrokDC/master | Adam Cozzette | 2017-05-30 | 3 | -3/+192 | |
|\ \ \ | ||||||
| * | | | Add headers as part of cmake project | Dennis Cappendijk | 2017-05-29 | 3 | -3/+192 | |
* | | | | Oneof field should be serialized even it's equal to default. (#3153) | Paul Yang | 2017-05-29 | 3 | -1/+17 | |
* | | | | Add ARRAY for reserved name (#3150) | Paul Yang | 2017-05-29 | 6 | -7/+13 | |
* | | | | Adds fluent setters for PHP (#3130) | Brent Shaffer | 2017-05-29 | 2 | -0/+15 | |
|/ / / | ||||||
* | | | Merge pull request #3113 from phst/master | Adam Cozzette | 2017-05-26 | 1 | -1/+3 | |
|\ \ \ | ||||||
| * | | | Improve fix for https://github.com/google/protobuf/issues/295 | Philipp Stephani | 2017-05-23 | 1 | -1/+3 |