aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3287 from sergiocampama/initializedThomas Van Lenten2017-06-291-1/+1
|\
| * Add initialized as a reserved keyword as that's the actual property nameSergio Campama2017-06-291-1/+1
|/
* Add scripts to build python wheel for linux. (#2693)Paul Yang2017-06-285-0/+121
* adds PHPDoc @return and @param for getters and setters respectively (#3131)Brent Shaffer2017-06-2736-925/+1220
* Merge pull request #3084 from lukaszx0/patch-1Feng Xiao2017-06-261-1/+1
|\
| * Workaround the docker bug when compiling artifactsŁukasz Strzałkowski2017-05-111-1/+1
* | Merge pull request #3264 from TeBoring/php-bugPaul Yang2017-06-2434-672/+847
|\ \
| * | Fix more implicit type conversions in public headers and generated code.Bo Yang2017-06-2426-449/+606
| * | Enusre public header and generated code have no implicit converion.Bo Yang2017-06-2321-229/+247
* | | Merge pull request #2968 from ngg/cpp-proper-fwdFeng Xiao2017-06-234-107/+0
|\ \ \ | |/ / |/| |
| * | C++: Do not forward-declare dependencies in generated .h filesGergely Nagy2017-06-124-107/+0
* | | Merge pull request #3266 from mbrickn/patch-1Feng Xiao2017-06-231-1/+1
|\ \ \
| * | | Updated links to use httpsMaxwell Paul Brickner2017-06-231-1/+1
|/ / /
* | | Merge pull request #3261 from thomasvl/super_oddcaseThomas Van Lenten2017-06-221-1/+1
|\ \ \
| * | | If we fail to get a descriptor just super the method resolving.Thomas Van Lenten2017-06-221-1/+1
|/ / /
* | | Switch to addEnumType to fix fatal error (#3225)Ryan Gordon2017-06-194-160/+235
* | | Updated upb to fix JSON conformance issues. (#3206)Joshua Haberman2017-06-195-580/+493
* | | Merge pull request #3243 from yjjnls/masterFeng Xiao2017-06-191-0/+2
|\ \ \
| * | | replenish missed header files in install stepyjjnls2017-06-191-0/+2
* | | | Merge pull request #3244 from thomasvl/complete_docsThomas Van Lenten2017-06-193-2/+25
|\ \ \ \
| * | | | ObjC: Document the exceptions on some of the writing apis.Thomas Van Lenten2017-06-193-2/+25
|/ / / /
* | | | Merge pull request #3240 from thomasvl/float_funThomas Van Lenten2017-06-193-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Raise the number of digits used for floats.Thomas Van Lenten2017-06-163-1/+3
* | | | Remove inclusion of ext/json/php_json.h. (#3241)Jeff Ching2017-06-171-1/+0
* | | | Merge pull request #3237 from calder/patch-1Feng Xiao2017-06-161-2/+2
|\ \ \ \
| * | | | Qualify string in java_options.hCalder Coalson2017-06-161-2/+2
| |/ / /
* | | | Merge pull request #3236 from buchgr/bazel-linksFeng Xiao2017-06-161-0/+3
|\ \ \ \
| * | | | bazel: add bazel symlinks to .gitignoreJakob Buchgraber2017-06-161-0/+3
| |/ / /
* | | | Merge pull request #3235 from buchgr/java-targetFeng Xiao2017-06-161-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | bazel: Make compiled jars java 6 binary compatible.Jakob Buchgraber2017-06-161-1/+2
|/ / /
* | | Fix php jenkins test (#3233)Paul Yang2017-06-153-6/+6
* | | Fix incorrect function call (#3232)michaelbausor2017-06-151-1/+1
* | | Follows proper autoloading standards (#3123)Brent Shaffer2017-06-1416-841/+1048
* | | Merge pull request #3228 from thomasvl/add_tvos_to_podspecThomas Van Lenten2017-06-141-0/+1
|\ \ \
| * | | Add tvOS to the podspec.Thomas Van Lenten2017-06-141-0/+1
|/ / /
* | | Merge pull request #3216 from traversaro/patch-1Feng Xiao2017-06-121-1/+1
|\ \ \ | |/ / |/| |
| * | Export symbols used in inline functionsSilvio Traversaro2017-06-121-1/+1
|/ /
* | Merge pull request #3176 from acozzette/fix-3114Adam Cozzette2017-06-071-4/+10
|\ \
| * | Ensure that for Java, imports of .proto files with empty packages worksAdam Cozzette2017-06-021-4/+10
* | | Merge pull request #3196 from matt-kwong/kokoroFeng Xiao2017-06-0718-0/+90
|\ \ \
| * | | Add continuous testing config files for KokoroMatt Kwong2017-06-0718-0/+90
* | | | Merge pull request #3191 from matt-kwong/kokoroFeng Xiao2017-06-0639-0/+337
|\| | |
| * | | Add MacOS and Linux tests to KokoroMatt Kwong2017-06-0639-0/+337
* | | | Merge pull request #3189 from thomasvl/objc_proto3_unknown_fieldsThomas Van Lenten2017-06-063-44/+5
|\ \ \ \
| * | | | ObjC: Preserve unknown fields in proto3 syntax files.Thomas Van Lenten2017-06-063-44/+5
* | | | | Merge pull request #3160 from meteorcloudy/winbuildFeng Xiao2017-06-061-12/+32
|\ \ \ \ \
| * | | | | Refactor cc options in BUILD file for WindowsYun Peng2017-05-311-12/+32
| | |_|/ / | |/| | |
* | | | | Merge pull request #3159 from yeswalrus/new-generateAdam Cozzette2017-06-063-84/+117
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | add protobuf_generate function, allows use of target_sources where availableWalter Gray2017-06-023-84/+117
| * | | | fix check_and_save_build_option not correctly exporting build optionsWalter Gray2017-05-301-1/+1