aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #2473 from thomasvl/update_xcodesThomas Van Lenten2016-12-093-10/+43
|\ \ \ \ | |_|/ / |/| | |
| * | | Mark objectivec_cocoapods_integration as failingThomas Van Lenten2016-12-091-0/+4
| * | | Skip benchmark test if cmake isn't installed.Thomas Van Lenten2016-12-091-5/+15
| * | | Xcode 8.1 supportThomas Van Lenten2016-12-093-6/+25
* | | | Merge pull request #2468 from sergei-ivanov/patch-1Feng Xiao2016-12-081-2/+2
|\ \ \ \
| * | | | Update third_party.mdSergei Ivanov2016-12-091-2/+2
* | | | | Disable jruby test. (#2469)Paul Yang2016-12-081-1/+1
|/ / / /
* | | | Update commit id in Dockerfile to trigger update. (#2467)Paul Yang2016-12-084-9/+16
* | | | Merge pull request #2462 from jbrianceau/fix-comp-builds-part2Feng Xiao2016-12-0813-91/+94
|\ \ \ \
| * | | | Regenerate descriptor protoJulien Brianceau2016-12-0812-88/+88
| * | | | C++: export _xxx_default_instance_ symbolsJulien Brianceau2016-12-081-3/+6
* | | | | Merge pull request #2461 from jbrianceau/add-missing-include-in-embed-ccFeng Xiao2016-12-081-0/+1
|\ \ \ \ \
| * | | | | Add missing include in embed.ccJulien Brianceau2016-12-081-0/+1
| |/ / / /
* | | | | Merge pull request #2394 from cwelton/formattingFeng Xiao2016-12-082-6/+30
|\ \ \ \ \
| * | | | | oneOf fix for JsonFormat includingDefaultValueFieldsCaleb Welton2016-12-052-6/+30
* | | | | | Make php generated code conform to PSR-4. (#2435)Paul Yang2016-12-0863-5231/+6509
| |_|/ / / |/| | | |
* | | | | Merge pull request #2466 from thomasvl/deprecation_followupThomas Van Lenten2016-12-0811-6/+216
|\ \ \ \ \
| * | | | | Improve ObjC deprecated annotation support.Thomas Van Lenten2016-12-0811-6/+216
| | |/ / / | |/| | |
* | | | | Merge pull request #2460 from sergiocampama/c11Feng Xiao2016-12-082-0/+984
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Include -std=c++11 when compiling protobuf if available.Sergio Campama2016-12-072-0/+984
| | |/ / | |/| |
* | | | Merge pull request #2459 from acozzette/android-loggingAdam Cozzette2016-12-071-2/+11
|\ \ \ \
| * | | | Send all protobuf logging to logcat by default on AndroidAdam Cozzette2016-12-071-2/+11
|/ / / /
* | | | Ruby: removed redundant RepeatedField#slice. (#2449)Joshua Haberman2016-12-071-1/+1
* | | | Merge pull request #2407 from jbrianceau/fix-comp-buildsFeng Xiao2016-12-071-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Export symbols used in inline functionsJulien Brianceau2016-12-071-1/+1
|/ / /
* | | Merge pull request #2437 from xfxyjwf/pluginFeng Xiao2016-12-0610-41/+1058
|\ \ \
| * | | Add version number to plugin protocol.Feng Xiao2016-12-0510-41/+1058
* | | | Merge pull request #2445 from ramrunner/masterFeng Xiao2016-12-051-1/+5
|\ \ \ \
| * | | | when on OpenBSD we include the correct headers for endianess and check the ap...ramrunner2016-12-051-1/+5
* | | | | Merge pull request #2442 from pherl/fix-bazelJisi Liu2016-12-052-0/+2
|\ \ \ \ \
| * | | | | Add missing files.Jisi Liu2016-12-052-0/+2
|/ / / / /
* | / / / Factored Conformance and Benchmark test messages into shared test schema. (#1...Joshua Haberman2016-12-0319-3878/+4032
| |/ / / |/| | |
* | | | Merge pull request #2436 from cgrushko/patch-1Feng Xiao2016-12-021-0/+7
|\ \ \ \
| * | | | Add a proto_lang_toolchain() for cc_proto_librarycgrushko2016-12-021-0/+7
|/ / / /
* | | | Merge pull request #2431 from saintstack/2228v2Feng Xiao2016-12-022-5/+80
|\ \ \ \
| * | | | Change CodedInputStream#DEFAULT_SIZE_LIMIT from 64MB toMichael Stack2016-12-012-5/+80
|/ / / /
* | | / Generate phpdoc in php generated files. (#2406)Paul Yang2016-12-014-119/+1229
| |_|/ |/| |
* | | Merge pull request #2429 from thomasvl/issue1833_swift_prefixThomas Van Lenten2016-11-304-198/+424
|\ \ \
| * | | Add a swift_prefix file option.Thomas Van Lenten2016-11-304-198/+424
|/ / /
* | | Merge pull request #2403 from google/down-integrate-with-msvc-fixAdam Cozzette2016-11-23297-13691/+15542
|\ \ \
| * | | Fixed Ruby tests for JRuby 1.7Adam Cozzette2016-11-231-2/+4
| * | | Updated descriptor_pool.py to be compatible with Python 3Adam Cozzette2016-11-221-1/+1
| * | | Add a "u" suffix to tag numbers in generated codeAdam Cozzette2016-11-2221-276/+334
| * | | Fixed descriptor_pool_test.py for Python 2.6Adam Cozzette2016-11-221-1/+1
| * | | Updated failure_list_java.txt for Java conformance testAdam Cozzette2016-11-221-1/+0
| * | | Merge pull request #2400 from acozzette/jspb-test-fixesAdam Cozzette2016-11-227-10/+16
| |\ \ \
| | * | | Added back in binary serialization round-trip in message_test.jsAdam Cozzette2016-11-211-0/+7
| | * | | Fixed remaining JSPB test failuresAdam Cozzette2016-11-215-5/+10
| | * | | Updated message_test.js so that it does not depend on fromObjectAdam Cozzette2016-11-211-7/+1
| | * | | Updated enum names in test.proto to avoid conflicting with testbinary.protoAdam Cozzette2016-11-211-3/+3