aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2733 from wmamrak/patch-1Adam Cozzette2017-02-271-1/+1
|\
| * Disable MSVC warning C4309Wojciech Mamrak2017-02-181-1/+1
* | Merge pull request #2729 from MarcelRaad/fix_inline_msvc12Adam Cozzette2017-02-271-6/+6
|\ \
| * | Fix unresolved symbols with MSVC12 and /Zc:inlineMarcel Raad2017-02-171-6/+6
| |/
* | Merge pull request #2355 from xfxyjwf/fixjsonFeng Xiao2017-02-242-14/+20
|\ \
| * | Speed up JSON parsing.Feng Xiao2016-11-102-14/+20
* | | Merge pull request #2732 from AsturaPhoenix/masterAdam Cozzette2017-02-241-1/+1
|\ \ \
| * | | const FieldDescriptorCompareRoss Wang2017-02-171-1/+1
| | |/ | |/|
* | | Merge pull request #2747 from liutikas/masterAdam Cozzette2017-02-241-0/+2
|\ \ \
| * | | Fix compiler warnings about unused variables in generated_message_reflection.hAurimas Liutikas2017-02-221-0/+2
* | | | Merge pull request #2734 from msabramo/patch-1Adam Cozzette2017-02-241-1/+1
|\ \ \ \
| * | | | README.md: Make docs URL a linkMarc Abramowitz2017-02-181-1/+1
| | |/ / | |/| |
* | | | Merge pull request #2630 from blodan/masterJisi Liu2017-02-241-1/+1
|\ \ \ \
| * | | | FreeBSD compatibilityDaniel Ylitalo2017-01-251-1/+1
* | | | | Merge pull request #2753 from thomasvl/recursive_dropThomas Van Lenten2017-02-233-0/+324
|\ \ \ \ \
| * | | | | Add GPBMessageDropUnknownFieldsRecursively() and tests.Thomas Van Lenten2017-02-233-0/+324
|/ / / / /
* | | | | Updating READMEJohn Brock2017-02-231-2/+52
* | | | | Upgrading test-related librariesJohn Brock2017-02-231-2/+2
* | | | | Fixes for .NET 3.5 compatibilityJohn Brock2017-02-2313-13/+154
| |_|/ / |/| | |
* | | | Merge pull request #2736 from na-ka-na/master3Feng Xiao2017-02-216-1/+63
|\ \ \ \ | |_|/ / |/| | |
| * | | Add an option to always print enums as ints in Json APISanchay Harneja2017-02-186-1/+63
|/ / /
* | | Merge pull request #2722 from ckennelly/unifiedAdam Cozzette2017-02-1622-236/+725
|\ \ \
| * | | Keep loop bounds in a local variable for string fields.Chris Kennelly2017-02-155-21/+21
| * | | Keep loop bounds in a local variable.Chris Kennelly2017-02-153-14/+14
| * | | Work with truncated tag numbers.Chris Kennelly2017-02-1512-201/+402
| * | | Expose rvalue setters for repeated string fields.Chris Kennelly2017-02-1512-0/+288
|/ / /
* | | Merge pull request #2663 from ckennelly/varint-sizeAdam Cozzette2017-02-152-26/+17
|\ \ \
| * | | Inline branch-less VarintSize32/VarintSize64 implementations.Chris Kennelly2017-02-022-26/+17
* | | | Merge pull request #2689 from ckennelly/aliasing-fixed32-fixed64Adam Cozzette2017-02-141-4/+2
|\ \ \ \
| * | | | Avoid aliasing CodedInputStream::buffer_ when parsing little endian integers.Chris Kennelly2017-02-071-4/+2
* | | | | Improve support for plugin parameters.Thomas Van Lenten2017-02-142-3/+47
* | | | | Merge pull request #2609 from yixiang/patch-1Feng Xiao2017-02-131-0/+10
|\ \ \ \ \
| * | | | | Undef TYPE_BOOL to avoid conflict with iOS.Sean Lu2017-01-191-0/+10
* | | | | | 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
| | |_|_|/ / / / | |/| | | | | |