aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4299 from hekike/feat/add-commonjs-strict-import-styleJoshua Haberman2018-07-028-11/+202
|\
| * fix(js_generator): check for protoPeter Marton2018-05-211-0/+1
| * Fix strict JS generator with import in a protofilePeter Marton2018-05-086-9/+65
| * Test: cover import_style=commonjs_strictPeter Marton2018-05-084-1/+112
| * Feat: add import-style=commonjs_strict option to the compilerPeter Marton2018-05-083-10/+33
* | Merge pull request #3847 from FX-HAO/masterJoshua Haberman2018-07-022-0/+12
|\ \
| * | Google::Protobuf::Struct can access a missing key (#3846)parker2017-11-172-0/+12
* | | Merge pull request #4854 from nehaljwani/win-exportsAdam Cozzette2018-07-022-4/+4
|\ \ \
| * | | Set LIBPROTOBUF_EXPORT on GenericTypeHandler<class google::protobuf::Message>Nehal J Wani2018-07-011-3/+3
| * | | Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsAdam Cozzette2018-07-011-1/+1
* | | | Merge pull request #4847 from depristo/masterFeng Xiao2018-07-021-1/+1
|\ \ \ \
| * | | | Remove unclear comment.mdepristo2018-06-301-1/+0
| * | | | Remove write-strings warning from COPTs.depristo2018-06-281-1/+2
* | | | | Merge pull request #4853 from jnordberg/patch-1Adam Cozzette2018-07-021-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add wsrpcJohan Nordberg2018-06-301-0/+1
|/ / / /
* | | | Merge pull request #4846 from ckhardin/mips-big-endianFeng Xiao2018-06-291-1/+1
|\ \ \ \
| * | | | Fix to allow a compilation under mips big endian with gccCharles Hardin2018-06-281-1/+1
| |/ / /
* / / / Fix capsule name. (#4836)Thomas Colthurst2018-06-291-1/+1
|/ / /
* | | Add -Og to no-warning-test (#4830)Paul Yang2018-06-2811-37/+42
* | | When initializing a message, skip a field if value is nil (#3693)Zachary Anker2018-06-263-0/+15
* | | Adds a base class for all explicitly raised TypeErrors (#4255)Erik Benoist2018-06-267-44/+53
* | | Merge pull request #4828 from mmatuszak-google/patch-1Adam Cozzette2018-06-261-1/+0
|\ \ \
| * | | Removed forward declaration of MemBlock classMichal Matuszak2018-06-251-1/+0
|/ / /
* | | Merge pull request #4827 from acozzette/merge-3-6-xAdam Cozzette2018-06-2559-93/+628
|\ \ \
| * \ \ Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-06-2559-93/+628
| |\ \ \
| | * | | Build ruby gem on kokoro (#4819)Paul Yang2018-06-257-1/+65
| | * | | Rename build_artifacts.cfg to release.cfg (#4818)Paul Yang2018-06-221-0/+0
| | * | | Add files to build ruby artifact for mac on kokoro (#4814)Paul Yang2018-06-224-0/+98
| | * | | Added Kokoro protoc release build for OS X (#4770)Adam Cozzette2018-06-182-0/+31
| | * | | Work around MSVC issue with std::atomic initialization (#4777)Adam Cozzette2018-06-182-3/+14
| | * | | Added Kokoro Windows release build config for protoc (#4766)Adam Cozzette2018-06-142-0/+35
| | * | | Use legacy name in php runtime (#4741)v3.6.0.1Paul Yang2018-06-077-22/+134
| | * | | Update php version to 3.6.0 (#4736)Paul Yang2018-06-062-4/+20
| | * | | Merge pull request #4713 from acozzette/changelogv3.6.0Adam Cozzette2018-06-062-1/+89
| | |\ \ \
| | | * | | Removed javanano from post_process_dist.shAdam Cozzette2018-06-051-1/+1
| | | * | | Updated the change log with changes for 3.6.0Adam Cozzette2018-06-011-0/+88
| | * | | | Merge pull request #4730 from acozzette/xcodeAdam Cozzette2018-06-065-10/+9
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Update code to work for Xcode 10b1 (#4729)Sergio Campamá2018-06-055-10/+9
| | |/ / /
| | * | | Merge pull request #4706 from acozzette/cxx-11Adam Cozzette2018-05-311-2/+2
| | |\ \ \
| | | * | | Require C++11 and pass -std=c++11Adam Cozzette2018-05-311-2/+2
| | |/ / /
| | * | | Merge pull request #4702 from TeBoring/3.6.xv3.6.0rc2Paul Yang2018-05-302-5/+26
| | |\ \ \
| | | * | | Move methods out of class (#4697)Paul Yang2018-05-302-15/+26
| | | * | | Add back GeneratedClassName to public (#4686)Paul Yang2018-05-301-0/+10
| | * | | | Merge pull request #4696 from acozzette/csharp-fixAdam Cozzette2018-05-301-4/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Removed duplicate using statement from ReflectionUtil.csAdam Cozzette2018-05-291-4/+0
| | * | | | Merge pull request #4695 from TeBoring/3.6.xPaul Yang2018-05-292-4/+18
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fix php memory leak test (#4692)Paul Yang2018-05-292-4/+18
| | |/ / /
| | * | | Merge pull request #4687 from acozzette/js-map-parsing-fixAdam Cozzette2018-05-254-6/+87
| | |\ \ \
| | | * | | Fixed JS parsing of unspecified map keysAdam Cozzette2018-05-254-6/+87
| | |/ / /
| | * | | Always add -std=c++11 for mac (#4684)Paul Yang2018-05-251-4/+2