aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge pull request #3190 from thomasvl/objc_IllegalZeroFieldNumThomas Van Lenten2017-06-063-10/+41
|\ \ \ \
| * | | | Properly error on a tag with field number zero.Thomas Van Lenten2017-06-063-10/+41
|/ / / /
* | | | Merge pull request #3157 from yeswalrus/fix-version-checkAdam Cozzette2017-06-051-14/+16
|\ \ \ \
| * | | | fix check_and_save_build_option not correctly exporting build optionsWalter Gray2017-06-021-1/+1
| |/ / /
| * | | Fix the check_and_save_build_option macro never evaluating to trueWalter Gray2017-05-301-1/+1
| * | | Fix find module not working when no version number was givenWalter Gray2017-05-301-12/+14
| |/ /
* | | Add new file option php_namespace. (#3162)Paul Yang2017-06-0542-442/+1070
* | | Merge pull request #3169 from dmaclach/masterThomas Van Lenten2017-06-011-1058/+1504
|\ \ \ | |_|/ |/| |
| * | Optimize GPBDictionary.m codegen to reduce size of overall library by 46K per...Dave MacLachlan2017-06-011-1058/+1504
| |/
* | Merge pull request #3170 from thomasvl/int64_map_issueThomas Van Lenten2017-06-012-1/+6
|\ \ | |/ |/|
| * Fix some cases of reading of 64bit map values.Thomas Van Lenten2017-06-012-1/+6
|/
* not to use std::random_device for map.Seed(). (#3133)Wayne Zhang2017-05-301-13/+0
* Merge pull request #3149 from KarrokDC/masterAdam Cozzette2017-05-303-3/+192
|\
| * Add headers as part of cmake projectDennis Cappendijk2017-05-293-3/+192
* | Oneof field should be serialized even it's equal to default. (#3153)Paul Yang2017-05-293-1/+17
* | Add ARRAY for reserved name (#3150)Paul Yang2017-05-296-7/+13
* | Adds fluent setters for PHP (#3130)Brent Shaffer2017-05-292-0/+15
|/
* Merge pull request #3113 from phst/masterAdam Cozzette2017-05-261-1/+3
|\
| * Improve fix for https://github.com/google/protobuf/issues/295Philipp Stephani2017-05-231-1/+3
* | update csharp README and fix .NET 3.5 build errorJohn Brock2017-05-252-44/+23
* | Add IncludeSource in csproj as per review commentsJon Skeet2017-05-241-0/+1
* | Convert C# projects to MSBuild (csproj) formatJon Skeet2017-05-2433-388/+269
* | Removing undefined behavior and compiler warnings (#1315)brian-peloton2017-05-237-32/+38
* | Merge pull request #3126 from mbrukman/fix-readme-formattingFeng Xiao2017-05-231-38/+45
|\ \
| * | Fix Markdown formatting in README.Misha Brukman2017-05-231-38/+45
| |/
* | Merge pull request #3117 from KarrokDC/masterFeng Xiao2017-05-231-0/+6
|\ \
| * | show help if protoc is called without any arguments, pre-empts -h and --help ...Dennis Cappendijk2017-05-221-0/+6
| |/
* | Merge pull request #3103 from sergiocampama/perfThomas Van Lenten2017-05-231-0/+106
|\ \ | |/ |/|
| * Adds serial and parallel parsing tests to check if parallel parsing is faster...Sergio Campama2017-05-231-0/+106
|/
* Merge pull request #3104 from thomasvl/ext_registry_copyThomas Van Lenten2017-05-177-23/+187
|\
| * Fix ExtensionRegistry copying and add tests.Thomas Van Lenten2017-05-177-23/+187
|/
* Merge pull request #2815 from devwout/ruby_json_emit_defaultsJoshua Haberman2017-05-152-33/+149
|\