aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added compatibility tests for version 3.0.0Adam Cozzette2017-04-0331-46/+5878
* Split test protos into two groupsAdam Cozzette2017-04-032-9/+65
* Removes ignored const from return type (#2915)Juan David Dominguez2017-03-291-1/+1
* Merge pull request #2919 from thomasvl/drop_dispatchThomas Van Lenten2017-03-292-17/+20
|\
| * Remove the use of dispatch_once that is heap backed.Thomas Van Lenten2017-03-292-17/+20
|/
* Merge pull request #2918 from thomasvl/xcode_8_3Thomas Van Lenten2017-03-291-0/+8
|\
| * Add support for Xcode 8.3 to the build helper.Thomas Van Lenten2017-03-291-0/+8
|/
* Merge pull request #2913 from thomasvl/conformance_ignoresThomas Van Lenten2017-03-291-0/+2
|\
| * Add some new ignores for things generated in conformance.Thomas Van Lenten2017-03-281-0/+2
* | Fix gcc warning when using map (#2213)drivehappy2017-03-281-1/+3
* | Merge pull request #2914 from acozzette/naclAdam Cozzette2017-03-281-1/+8
|\ \ | |/ |/|
| * Added a workaround to allow building for NaClAdam Cozzette2017-03-281-1/+8
|/
* Merge pull request #2912 from thomasvl/objc_recursion_limitThomas Van Lenten2017-03-282-10/+23
|\
| * Raise the recursion limit to 100 to match other languages.Thomas Van Lenten2017-03-282-10/+23
|/
* Merge pull request #2858 from haberman/gopackageJoshua Haberman2017-03-272-4/+5
|\
| * Properly regenerated descriptor.proto.Josh Haberman2017-03-161-3/+4
| * Changed go_package for plugin.proto.Josh Haberman2017-03-151-1/+1
* | Merge pull request #1662 from haberman/jsconformanceJoshua Haberman2017-03-277-9/+237
|\ \
| * | Removed obsolete comments and added docs.Josh Haberman2017-03-162-5/+30
| * | Build system fixes for JS conformance tests.Josh Haberman2017-03-141-3/+5
| * | Conformance test for JS now work, though 15 tests fail.Josh Haberman2017-03-133-27/+49
| * | Added JavaScript conformance tests. All tests pass!Josh Haberman2017-03-065-1/+180
| * | WIP.Josh Haberman2017-03-061-4/+4
* | | Merge pull request #2884 from anandolee/masterJie Luo2017-03-273-19/+78
|\ \ \
| * | | Add FormatEnumAsInt support for Json Format. And scale JsonFormatter.Settings...Jie Luo2017-03-243-19/+78
* | | | Merge pull request #2897 from cgrushko/patch-5Feng Xiao2017-03-221-0/+1
|\ \ \ \
| * | | | Compile the Java proto runtime with Java 6cgrushko2017-03-221-0/+1
|/ / / /
* | | | Update commit number in Docker to update composer dependency (#2869)Paul Yang2017-03-215-6/+8
* | | | Merge pull request #2861 from byronyi/#710Adam Cozzette2017-03-207-0/+209
|\ \ \ \
| * | | | Update BUILDBairen Yi2017-03-211-0/+1
| * | | | Update delimited_message_util_test.ccBairen Yi2017-03-181-1/+1
| * | | | fix several issuesByron Yi2017-03-173-15/+15
| * | | | add delimited_message_util.cc to libprotobuf.cmakeByron Yi2017-03-161-0/+1
| * | | | add LIBPROTOBUF_EXPORT to make msvc happyByron Yi2017-03-161-6/+6
| * | | | migrate delimited messages functions to util packageByron Yi2017-03-166-0/+207
| | |_|/ | |/| |
* | | | Merge pull request #2860 from prehistoric-penguin/masterFeng Xiao2017-03-203-90/+0
|\ \ \ \
| * | | | Remove duplicated copyright statementprehistoric-penguin2017-03-163-90/+0
| |/ / /
* | | | Merge pull request #2854 from hesmar/attributesFixAdam Cozzette2017-03-203-31/+31
|\ \ \ \
| * | | | fix attributes warningMarkus Heß2017-03-153-31/+31
* | | | | Merge pull request #2870 from acozzette/memcpy-memmoveAdam Cozzette2017-03-201-5/+5
|\ \ \ \ \
| * | | | | Ruby: only link against specific version of memcpy if we're using glibcAdam Cozzette2017-03-171-5/+5
* | | | | | Merge pull request #2867 from mojoBrendan/masterFeng Xiao2017-03-177-9/+86
|\ \ \ \ \ \
| * | | | | | Add option to preserve original proto field namesBrendan McCarthy2017-03-179-28/+87
| * | | | | | Add use_snake_case_for_field_names option to JsonPrintOptionsBrendan McCarthy2017-03-174-3/+21
| |/ / / / /
* | | | | | Merge pull request #2837 from anandolee/masterJie Luo2017-03-172-2/+19
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | DefaultValueObjectWriter should populate oneof message fieldJie Luo2017-03-102-2/+19
* | | | | | Add file option php_class_prefix (#2849)Paul Yang2017-03-1745-665/+943
* | | | | | Merge pull request #2848 from xfxyjwf/freebsdFeng Xiao2017-03-174-0/+63
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix freebsd build.Feng Xiao2017-03-144-0/+63
| | |/ / / | |/| | |
* | | | | Merge pull request #2866 from xfxyjwf/nanoFeng Xiao2017-03-161-0/+3
|\ \ \ \ \