aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-31146-4556/+6828
* Merge pull request #2226 from kchodorow/masterJoshua Haberman2017-01-301-6/+24
|\
| * Update genfiles paths to work with a different execroot arrangementKristina Chodorow2017-01-251-6/+24
* | C#: Implement IReadOnlyList<T> in RepeatedField<T>Jon Skeet2017-01-301-0/+3
* | Merge pull request #2639 from anandolee/masterJie Luo2017-01-283-116/+116
|\ \
| * | Add Oneof custom options testJie Luo2017-01-273-116/+116
* | | fix compile error on centos in metadata.h for constructors. (#2599)michaelpengcn2017-01-271-2/+4
* | | Oneof accessor should return the field name that is actually set. (#2631)Paul Yang2017-01-276-2/+61
|/ /
* | Merge pull request #2619 from anandolee/masterJie Luo2017-01-2732-1/+5851
|\ \
| * | Add python compatibility tests against v2.5.0 amd run on Travis.Jie Luo2017-01-266-4/+220
| * | Add python compatibility tests against v2.5.0: copy tests and proto files fro...Jie Luo2017-01-2328-0/+5634
* | | Merge pull request #2633 from anandolee/jieluo_branch1Jie Luo2017-01-261-1/+1
|\ \ \
| * | | Allow OneofOptions to be extended in proto3.Jie Luo2017-01-251-1/+1
| |/ /
* | | Merge pull request #2626 from sergiocampama/8_3Thomas Van Lenten2017-01-252-242/+242
|\ \ \
| * | | Adds nullability modifiers to resolve Xcode 8.3 warningsSergio Campama2017-01-252-242/+242
|/ / /
* | | Merge pull request #2614 from acozzette/gzip-output-stream-optionsAdam Cozzette2017-01-231-1/+1
|\ \ \
| * | | Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsAdam Cozzette2017-01-201-1/+1
|/ / /
* / / Support custom options in C#Jon Skeet2017-01-1917-14/+3727
|/ /
* | Merge pull request #2591 from thomasvl/objc_timestamps_take2Thomas Van Lenten2017-01-173-71/+160
|\ \ | |/ |/|
| * Timestamp helper fix, Duration helper cleanup.Thomas Van Lenten2017-01-123-71/+160
|/
* Merge pull request #2587 from google/revert-2586-objc_timestampThomas Van Lenten2017-01-122-57/+33
|\
| * Revert "Fix Timestamps with dates before the Unix epoch that contain fraction...Thomas Van Lenten2017-01-122-57/+33
|/
* Merge pull request #2586 from thomasvl/objc_timestampThomas Van Lenten2017-01-122-33/+57
|\
| * Fix Timestamps with dates before the Unix epoch that contain fractional seconds.Thomas Van Lenten2017-01-122-33/+57
|/
* Merge pull request #2584 from cgrushko/patch-2Feng Xiao2017-01-121-1/+8
|\
| * Add a proto_lang_toolchain for Javacgrushko2017-01-121-1/+8
|/
* Merge pull request #2529 from wackoisgod/masterAdam Cozzette2017-01-123-2/+15
|\
| * Fixing code formatting issuesAndrew Spiering2017-01-112-14/+5
| * Merge branch 'master' of https://github.com/wackoisgod/protobufAndrew Spiering2017-01-110-0/+0
| * Added the support for class level deprecation which will in turn also depreca...Andrew Spiering2016-12-213-0/+22
* | Merge pull request #2567 from acozzette/distcheck-fixAdam Cozzette2017-01-101-2/+4
|\ \
| * | Fixed "make distcheck" for the Autotools buildAdam Cozzette2017-01-091-2/+4
* | | Add ByteString.FromStream and ByteString.FromStreamAsync in C#Jon Skeet2017-01-103-1/+108
* | | Add global.json file to pick dotnet core SDK version.Jon Skeet2017-01-102-0/+6
|/ /
* | PHP fix int64 decoding (#2516)Sufir2017-01-082-28/+77
* | Fix generation of extending nested messages in JavaScript (#2439)Marcus Longmuir2017-01-064-7/+74
* | A few more cases for binary conformance tests. (#2500)Joshua Haberman2017-01-062-12/+35
* | Merge pull request #2565 from acozzette/cross-compilationAdam Cozzette2017-01-054-3/+242
|\ \
| * | Fixed cross compilations with the Autotools buildAdam Cozzette2017-01-034-3/+242
* | | Merge pull request #2563 from thomasvl/autocreator_tweaksThomas Van Lenten2017-01-0511-16/+435
|\ \ \
| * | | Minor fix for autocreated object repeated fields and maps.Thomas Van Lenten2017-01-0511-16/+435
| |/ /
* | | Merge pull request #2544 from tiziano88/masterAdam Cozzette2017-01-041-0/+1
|\ \ \
| * | | Add link to Elm proto pluginTiziano Santoro2016-12-281-0/+1
* | | | Merge pull request #2536 from jbrianceau/fix-js-embed-include-styleAdam Cozzette2017-01-041-1/+1
|\ \ \ \
| * | | | Fix include in auto-generated well_known_types_embed.ccJulien Brianceau2016-12-271-1/+1
* | | | | Merge pull request #2564 from acozzette/arena-ncAdam Cozzette2017-01-042-106/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Removed arena_nc.cc and arena_nc_test.pyAdam Cozzette2017-01-042-106/+0
|/ / / /
* | / / Fixed issue with autoloading - Invalid paths (#2538)NicklasWallgren2016-12-281-3/+3
| |/ / |/| |
* | | Merge pull request #2542 from jbrianceau/fix-embed-cc-warningFeng Xiao2016-12-271-1/+1
|\ \ \ | |/ / |/| |
| * | Fix warning in compiler/js/embed.ccJulien Brianceau2016-12-271-1/+1
|/ /