aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add a proto_lang_toolchain for Javacgrushko2017-01-121-1/+8
* Merge pull request #2529 from wackoisgod/masterAdam Cozzette2017-01-123-2/+15
|\
| * Fixing code formatting issuesAndrew Spiering2017-01-112-14/+5
| * Merge branch 'master' of https://github.com/wackoisgod/protobufAndrew Spiering2017-01-110-0/+0
| * Added the support for class level deprecation which will in turn also depreca...Andrew Spiering2016-12-213-0/+22
* | Merge pull request #2567 from acozzette/distcheck-fixAdam Cozzette2017-01-101-2/+4
|\ \
| * | Fixed "make distcheck" for the Autotools buildAdam Cozzette2017-01-091-2/+4
* | | Add ByteString.FromStream and ByteString.FromStreamAsync in C#Jon Skeet2017-01-103-1/+108
* | | Add global.json file to pick dotnet core SDK version.Jon Skeet2017-01-102-0/+6
|/ /
* | PHP fix int64 decoding (#2516)Sufir2017-01-082-28/+77
* | Fix generation of extending nested messages in JavaScript (#2439)Marcus Longmuir2017-01-064-7/+74
* | A few more cases for binary conformance tests. (#2500)Joshua Haberman2017-01-062-12/+35
* | Merge pull request #2565 from acozzette/cross-compilationAdam Cozzette2017-01-054-3/+242
|\ \
| * | Fixed cross compilations with the Autotools buildAdam Cozzette2017-01-034-3/+242
* | | Merge pull request #2563 from thomasvl/autocreator_tweaksThomas Van Lenten2017-01-0511-16/+435
|\ \ \
| * | | Minor fix for autocreated object repeated fields and maps.Thomas Van Lenten2017-01-0511-16/+435
| |/ /
* | | Merge pull request #2544 from tiziano88/masterAdam Cozzette2017-01-041-0/+1
|\ \ \
| * | | Add link to Elm proto pluginTiziano Santoro2016-12-281-0/+1
* | | | Merge pull request #2536 from jbrianceau/fix-js-embed-include-styleAdam Cozzette2017-01-041-1/+1
|\ \ \ \
| * | | | Fix include in auto-generated well_known_types_embed.ccJulien Brianceau2016-12-271-1/+1
* | | | | Merge pull request #2564 from acozzette/arena-ncAdam Cozzette2017-01-042-106/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Removed arena_nc.cc and arena_nc_test.pyAdam Cozzette2017-01-042-106/+0
|/ / / /
* | / / Fixed issue with autoloading - Invalid paths (#2538)NicklasWallgren2016-12-281-3/+3
| |/ / |/| |
* | | Merge pull request #2542 from jbrianceau/fix-embed-cc-warningFeng Xiao2016-12-271-1/+1
|\ \ \ | |/ / |/| |
| * | Fix warning in compiler/js/embed.ccJulien Brianceau2016-12-271-1/+1
|/ /
* | Merge pull request #2523 from jbrianceau/init-index-in-metadataAdam Cozzette2016-12-221-9/+12
|\ \
| * | Init index_in_metadata_ without conditionJulien Brianceau2016-12-211-9/+12
| |/
* | Merge pull request #2525 from camillol/liteFeng Xiao2016-12-222-14/+32
|\ \ | |/ |/|
| * simpler, cheaper callback to LazyStringOutputStreamCamillo Lugaresi2016-12-211-14/+2
| * add MethodResultCallback_0_0Camillo Lugaresi2016-12-211-0/+30
|/
* Merge pull request #2521 from acozzette/fix-bazelAdam Cozzette2016-12-212-2/+24
|\
| * Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned upAdam Cozzette2016-12-201-1/+2
| * Updated Makefile.am to fix out-of-tree buildsAdam Cozzette2016-12-201-1/+4
| * Added Bazel genrule for generating well_known_types_embed.ccAdam Cozzette2016-12-201-0/+18
|/
* Merge pull request #2506 from ckennelly/rvalue-settersAdam Cozzette2016-12-1913-1/+942
|\
| * Add rvalue setters for non-arena strings on C++11.Chris Kennelly2016-12-1613-1/+942
* | Merge pull request #2505 from ckennelly/masterAdam Cozzette2016-12-191-11/+4
|\ \
| * | Remove spurious NULL checks in ArenaStringPtr::CreateInstance.Chris Kennelly2016-12-151-11/+4
| |/
* | Merge pull request #2517 from acozzette/js-embedAdam Cozzette2016-12-196-325/+35
|\ \
| * | Fixed "make check" for cmake buildAdam Cozzette2016-12-191-0/+1
| * | Auto-generate well_known_types_embed.ccAdam Cozzette2016-12-195-325/+34
|/ /
* | Merge pull request #2227 from KindDragon/3.1.xFeng Xiao2016-12-164-41/+43
|\ \
| * | LIBPROTOC_EXPORT added to others functions in csharp_names.h and objectivec_h...Arkadiy Shapkin2016-12-012-33/+33
| * | Missed LIBPROTOC_EXPORT for GRPC addedArkadiy Shapkin2016-12-014-8/+10
* | | Give C# ByteString a sensible GetHashCode implementation.Jon Skeet2016-12-162-1/+14
| |/ |/|
* | Merge pull request #2499 from ckennelly/masterAdam Cozzette2016-12-152-2/+11
|\ \
| * | Define LANG_CXX11 for port.h and use this to guard C++11 features.Chris Kennelly2016-12-142-2/+11
|/ /
* | Merge pull request #2495 from acozzette/android-hashAdam Cozzette2016-12-142-9/+3
|\ \
| * | Removed Android-specific code from stubs/hash.hAdam Cozzette2016-12-132-9/+3
* | | Merge pull request #2498 from sergiocampama/enumThomas Van Lenten2016-12-141-1/+5
|\ \ \