aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4073 from pherl/changelogv3.5.1Jisi Liu2017-12-201-0/+31
|\
| * Update changelogJisi Liu2017-12-201-1/+1
| * Update changelogJisi Liu2017-12-191-2/+7
| * Merge branch '3.5.x' of github.com:google/protobuf into changelogJisi Liu2017-12-1926-28/+28
| |\
| * | Update changelog for 3.5.1Jisi Liu2017-12-191-0/+26
* | | Merge pull request #4080 from pherl/arm64Jisi Liu2017-12-201-0/+3
|\ \ \
| * | | Add support for Windows ARM64 buildMiradham Kamilov2017-12-201-0/+3
| | |/ | |/|
* | | Merge pull request #4072 from google/jieluoJisi Liu2017-12-1955-769/+4529
|\ \ \
| * | | Cherrypick for csharp, including:Jie Luo2017-12-1955-769/+4529
| | |/ | |/|
* | | Merge pull request #4076 from pherl/stringbackJisi Liu2017-12-191-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix string::back() usage in googletest.ccJisi Liu2017-12-191-1/+1
|/ /
* | Merge pull request #4074 from pherl/mapatJisi Liu2017-12-191-1/+1
|\ \
| * | Replace C++11 only method std::map::atJisi Liu2017-12-191-1/+1
| |/
* | Merge pull request #4070 from pherl/3.5.xJisi Liu2017-12-1925-27/+27
|\ \ | |/ |/|
| * Update version number to 3.5.1Jisi Liu2017-12-1925-27/+27
|/
* Fix file permission for python package.Feng Xiao2017-12-151-0/+1
* Merge pull request #4034 from TeBoring/php-timestamp-bugPaul Yang2017-12-154-16/+84
|\
| * Fix for php5.5Bo Yang2017-12-141-1/+1
| * Accept DatetimeInterface in fromDatetimeBo Yang2017-12-142-12/+14
| * Avoid using php_date_get_date_ce() in case date extension is notBo Yang2017-12-131-2/+15
| * Call php method via function name instead of calling directly.Bo Yang2017-12-124-34/+50
| * Replace private timelib_update_ts with public date_timestamp_getBo Yang2017-12-122-5/+31
| * Add PROTOBUF_ENABLE_TIMESTAMP to let user decide whether timestamp utilBo Yang2017-12-122-2/+13
* | Merge pull request #4040 from bazurbat/3.5.xAdam Cozzette2017-12-151-0/+1
|\ \
| * | Create containing directory before generating well_known_types_embed.ccOleg Kolosov2017-12-131-0/+1
| |/
* | Merge pull request #4049 from pherl/py26Jisi Liu2017-12-141-1/+0
|\ \
| * | Remove py2.6 support.Jisi Liu2017-12-141-1/+0
* | | Merge pull request #4042 from pherl/cpp_enumJisi Liu2017-12-131-9/+9
|\ \ \
| * | | Use matching enum type for IsPOD.Jisi Liu2017-12-131-9/+9
* | | | Merge pull request #4043 from pherl/flushJisi Liu2017-12-131-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Explicitly propagate the status of Flush().Jisi Liu2017-12-131-2/+2
|/ / /
* | | Merge pull request #4028 from TeBoring/3.5.xPaul Yang2017-12-121-1/+1
|\ \ \ | |_|/ |/| |
| * | Add backslach to make class explict in global namespaceBo Yang2017-12-111-1/+1
* | | Merge pull request #4026 from TeBoring/3.5.xPaul Yang2017-12-116-7/+66
|\ \ \ | |/ / |/| |
| * | Merge branch '3.5.0.1' into 3.5.xBo Yang2017-12-116-7/+66
|/| |
| * | Add release logv3.5.0.1Bo Yang2017-12-061-0/+16
| * | Update php c extension version number to 3.5.0.1Bo Yang2017-12-062-4/+4
| * | Fix memory leak in php7Bo Yang2017-12-063-5/+11
| * | Fix several more memory leakBo Yang2017-12-064-6/+27
| * | Fix memory leak when creating map field via array.Bo Yang2017-12-062-2/+6
| * | Fix memory leak when creating repeated field via array.Bo Yang2017-12-062-2/+6
| * | Remove duplicate typedef. (#3975)Paul Yang2017-12-061-19/+7
* | | Fix ruby gc_test in ruby 2.4 (#4011)Paul Yang2017-12-083-13/+13
* | | Add discard unknown API in ruby. (#3990)Paul Yang2017-12-076-0/+168
* | | Recursively clear unknown fields in submessages. (#3982)Paul Yang2017-12-073-4/+159
* | | Merge pull request #4013 from laszlocsomor/io_win32Jisi Liu2017-12-073-126/+274
|\ \ \
| * | | io_win32_unittest: remove incorrect error checkLaszlo Csomor2017-12-071-3/+3
| * | | io_win32_unittest: fix condition in GetCwdAsUtf8Laszlo Csomor2017-12-071-1/+1
| * | | io_win32_unittest: use CWD as last tempdirLaszlo Csomor2017-12-071-3/+26
| * | | io_win32: add more encoding-related testsLaszlo Csomor2017-12-073-31/+89