Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2884 from anandolee/master | Jie Luo | 2017-03-27 | 3 | -19/+78 |
|\ | |||||
| * | Add FormatEnumAsInt support for Json Format. And scale JsonFormatter.Settings... | Jie Luo | 2017-03-24 | 3 | -19/+78 |
* | | Merge pull request #2897 from cgrushko/patch-5 | Feng Xiao | 2017-03-22 | 1 | -0/+1 |
|\ \ | |||||
| * | | Compile the Java proto runtime with Java 6 | cgrushko | 2017-03-22 | 1 | -0/+1 |
|/ / | |||||
* | | Update commit number in Docker to update composer dependency (#2869) | Paul Yang | 2017-03-21 | 5 | -6/+8 |
* | | Merge pull request #2861 from byronyi/#710 | Adam Cozzette | 2017-03-20 | 7 | -0/+209 |
|\ \ | |||||
| * | | Update BUILD | Bairen Yi | 2017-03-21 | 1 | -0/+1 |
| * | | Update delimited_message_util_test.cc | Bairen Yi | 2017-03-18 | 1 | -1/+1 |
| * | | fix several issues | Byron Yi | 2017-03-17 | 3 | -15/+15 |
| * | | add delimited_message_util.cc to libprotobuf.cmake | Byron Yi | 2017-03-16 | 1 | -0/+1 |
| * | | add LIBPROTOBUF_EXPORT to make msvc happy | Byron Yi | 2017-03-16 | 1 | -6/+6 |
| * | | migrate delimited messages functions to util package | Byron Yi | 2017-03-16 | 6 | -0/+207 |
* | | | Merge pull request #2860 from prehistoric-penguin/master | Feng Xiao | 2017-03-20 | 3 | -90/+0 |
|\ \ \ | |||||
| * | | | Remove duplicated copyright statement | prehistoric-penguin | 2017-03-16 | 3 | -90/+0 |
| |/ / | |||||
* | | | Merge pull request #2854 from hesmar/attributesFix | Adam Cozzette | 2017-03-20 | 3 | -31/+31 |
|\ \ \ | |||||
| * | | | fix attributes warning | Markus Heß | 2017-03-15 | 3 | -31/+31 |
* | | | | Merge pull request #2870 from acozzette/memcpy-memmove | Adam Cozzette | 2017-03-20 | 1 | -5/+5 |
|\ \ \ \ | |||||
| * | | | | Ruby: only link against specific version of memcpy if we're using glibc | Adam Cozzette | 2017-03-17 | 1 | -5/+5 |
* | | | | | Merge pull request #2867 from mojoBrendan/master | Feng Xiao | 2017-03-17 | 7 | -9/+86 |
|\ \ \ \ \ | |||||
| * | | | | | Add option to preserve original proto field names | Brendan McCarthy | 2017-03-17 | 9 | -28/+87 |
| * | | | | | Add use_snake_case_for_field_names option to JsonPrintOptions | Brendan McCarthy | 2017-03-17 | 4 | -3/+21 |
| |/ / / / | |||||
* | | | | | Merge pull request #2837 from anandolee/master | Jie Luo | 2017-03-17 | 2 | -2/+19 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | DefaultValueObjectWriter should populate oneof message field | Jie Luo | 2017-03-10 | 2 | -2/+19 |
* | | | | | Add file option php_class_prefix (#2849) | Paul Yang | 2017-03-17 | 45 | -665/+943 |
* | | | | | Merge pull request #2848 from xfxyjwf/freebsd | Feng Xiao | 2017-03-17 | 4 | -0/+63 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix freebsd build. | Feng Xiao | 2017-03-14 | 4 | -0/+63 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #2866 from xfxyjwf/nano | Feng Xiao | 2017-03-16 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | Add a notice for nano. | Feng Xiao | 2017-03-16 | 1 | -0/+3 |
* | | | | | Merge pull request #2859 from haberman/junit-dep-scope | Joshua Haberman | 2017-03-16 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Changed scope of Java deps to "test". | Josh Haberman | 2017-03-15 | 1 | -0/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #2847 from haberman/ruby-toh | Joshua Haberman | 2017-03-16 | 4 | -2/+55 |
|\ \ \ \ \ | |||||
| * | | | | | Made formatting more consistent. | Josh Haberman | 2017-03-15 | 1 | -2/+2 |
| * | | | | | Ruby: fixed Message#to_h for map fields. | Josh Haberman | 2017-03-14 | 4 | -2/+55 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #2794 from acozzette/jspb-extensions | Adam Cozzette | 2017-03-16 | 3 | -7/+6 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | JS: ensure that extension values are serialized even if they're falsy | Adam Cozzette | 2017-03-06 | 3 | -7/+6 |
* | | | | | Merge pull request #2023 from odeke-em/fix-print-help-to-stdout | Joshua Haberman | 2017-03-15 | 2 | -8/+18 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | compiler/cli: PrintHelpText prints to stdout instead of stderr | Emmanuel Odeke | 2017-03-08 | 2 | -8/+18 |
* | | | | | Incremented Ruby version number to 3.2.0.1 | Adam Cozzette | 2017-03-15 | 1 | -1/+1 |
* | | | | | Ruby: update Gemspec. | Josh Haberman | 2017-03-15 | 1 | -3/+3 |
* | | | | | Fix libprotoc.cmake to generate well_known_types_embed.cc | Konstantin Podsvirov | 2017-03-15 | 1 | -1/+1 |
* | | | | | Bug fix: When encoding, negative int32 values should be padded to int64 (#2660) | Paul Yang | 2017-03-15 | 8 | -23/+49 |
* | | | | | Ruby: build packages for Ruby 2.4. | Josh Haberman | 2017-03-15 | 1 | -2/+2 |
* | | | | | Merge pull request #2829 from afrantzis/hide-unnecessary-library-symbols | Adam Cozzette | 2017-03-15 | 5 | -0/+61 |
|\ \ \ \ \ | |||||
| * | | | | | Hide unnecessary exported library symbols | Alexandros Frantzis | 2017-03-13 | 5 | -0/+61 |
* | | | | | | Merge pull request #2846 from acozzette/bytestream-comment | Adam Cozzette | 2017-03-15 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Updated an outdated comment in bytestream.h | Adam Cozzette | 2017-03-14 | 1 | -1/+1 |
* | | | | | | | Merge pull request #2855 from thomasvl/copy_note | Thomas Van Lenten | 2017-03-15 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Document deep copy in the header | Thomas Van Lenten | 2017-03-15 | 1 | -0/+5 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #2843 from haberman/check | Joshua Haberman | 2017-03-14 | 1 | -3/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Replace CHECK() with GOOGLE_CHECK(). | Josh Haberman | 2017-03-13 | 1 | -3/+4 |
|/ / / / / |