aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | Add a notice for nano.Feng Xiao2017-03-161-0/+3
* | | | | Merge pull request #2859 from haberman/junit-dep-scopeJoshua Haberman2017-03-161-0/+3
|\ \ \ \ \
| * | | | | Changed scope of Java deps to "test".Josh Haberman2017-03-151-0/+3
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2847 from haberman/ruby-tohJoshua Haberman2017-03-164-2/+55
|\ \ \ \ \
| * | | | | Made formatting more consistent.Josh Haberman2017-03-151-2/+2
| * | | | | Ruby: fixed Message#to_h for map fields.Josh Haberman2017-03-144-2/+55
| | |_|/ / | |/| | |
* | | | | Merge pull request #2794 from acozzette/jspb-extensionsAdam Cozzette2017-03-163-7/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | JS: ensure that extension values are serialized even if they're falsyAdam Cozzette2017-03-063-7/+6
* | | | | Merge pull request #2023 from odeke-em/fix-print-help-to-stdoutJoshua Haberman2017-03-152-8/+18
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | compiler/cli: PrintHelpText prints to stdout instead of stderrEmmanuel Odeke2017-03-082-8/+18
* | | | | Incremented Ruby version number to 3.2.0.1Adam Cozzette2017-03-151-1/+1
* | | | | Ruby: update Gemspec.Josh Haberman2017-03-151-3/+3
* | | | | Fix libprotoc.cmake to generate well_known_types_embed.ccKonstantin Podsvirov2017-03-151-1/+1
* | | | | Bug fix: When encoding, negative int32 values should be padded to int64 (#2660)Paul Yang2017-03-158-23/+49
* | | | | Ruby: build packages for Ruby 2.4.Josh Haberman2017-03-151-2/+2
* | | | | Merge pull request #2829 from afrantzis/hide-unnecessary-library-symbolsAdam Cozzette2017-03-155-0/+61
|\ \ \ \ \
| * | | | | Hide unnecessary exported library symbolsAlexandros Frantzis2017-03-135-0/+61
* | | | | | Merge pull request #2846 from acozzette/bytestream-commentAdam Cozzette2017-03-151-1/+1
|\ \ \ \ \ \
| * | | | | | Updated an outdated comment in bytestream.hAdam Cozzette2017-03-141-1/+1
* | | | | | | Merge pull request #2855 from thomasvl/copy_noteThomas Van Lenten2017-03-151-0/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Document deep copy in the headerThomas Van Lenten2017-03-151-0/+5
|/ / / / / /
* | | | | | Merge pull request #2843 from haberman/checkJoshua Haberman2017-03-141-3/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Replace CHECK() with GOOGLE_CHECK().Josh Haberman2017-03-131-3/+4
|/ / / / /
* | | | | Merge pull request #2836 from xfxyjwf/i894Feng Xiao2017-03-132-123/+117
|\ \ \ \ \
| * | | | | Double-quote file paths in extract_includes.bat.inFeng Xiao2017-03-102-123/+117
* | | | | | Merge pull request #2835 from pherl/javaepJisi Liu2017-03-131-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |