aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2701 from anandolee/masterJie Luo2017-02-1337-1/+7893
|\
| * Add csharp compatibility tests against v3.0.0 and run on Travis.Jie Luo2017-02-102-1/+106
| * Add proto and test files for csharp compatibility tests against v3.0.0.Jie Luo2017-02-0935-0/+7787
* | Merge pull request #2451 from podsvirov/json-primitive-mapFeng Xiao2017-02-131-1/+14
|\ \
| * | JsonUtilTest: Add ParsePrimitiveMapIn subtestKonstantin Podsvirov2017-02-111-1/+14
* | | Merge pull request #2704 from liutikas/masterFeng Xiao2017-02-131-0/+3
|\ \ \
| * | | Fix compiler warnings about unused variables in wire_format.hAurimas Liutikas2017-02-101-0/+3
* | | | Add clear method to PHP message (#2700)Paul Yang2017-02-1110-12/+277
|/ / /
* | | Switch to gcc atomic intrinsics for macOS and delete the file that uses (#2699)Jonathan Hseu2017-02-104-235/+3
* | | Merge pull request #2656 from pcj/patch-1Feng Xiao2017-02-101-0/+4
|\ \ \
| * | | Add bazel protobuf resourcesPaul Cody Johnston2017-02-011-0/+4
* | | | Merge pull request #2647 from anandolee/masterJie Luo2017-02-092-11/+14
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Fix python compatibility test when a new generated code imports an old versio...Jie Luo2017-02-092-11/+14
* | | Merge pull request #2692 from cgrushko/patch-3Feng Xiao2017-02-081-1/+1
|\ \ \
| * | | Update load() statement to latest stylecgrushko2017-02-081-1/+1
|/ / /
* | | Merge pull request #2691 from cgrushko/patch-3Feng Xiao2017-02-081-2/+3
|\ \ \
| * | | Bazel can build protobuf when it's not in the rootcgrushko2017-02-081-2/+3
* | | | Implement json encoding decoding for php. (#2682)Paul Yang2017-02-089-390/+179
|/ / /
* | | Add fixed version to phpunit used in travis (#2673)Paul Yang2017-02-071-1/+1
* | | Merge pull request #2681 from sergiocampama/spacesThomas Van Lenten2017-02-072-55/+55
|\ \ \
| * | | Removes trailing whitespacesSergio Campama2017-02-072-55/+55
|/ / /
* | | Update upb for php. (#2662)Paul Yang2017-02-064-936/+2245
* | | Fix CopyTo argument validationJon Skeet2017-02-062-2/+18
* | | Add conformance test for php (#2655)Paul Yang2017-02-016-7/+1422
| |/ |/|
* | 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
|/