9887 Commits (6e8a7cdcb0516424d3d686224e17b2700bae7e79)
 

Author SHA1 Message Date
Brent Shaffer d8f882b675 fix: fix PHP readonly legacy files for nested messages 2 years ago
Matt Fowles Kulukundis 690cd12817
Merge pull request #10358 from ctiller/patch-1 2 years ago
Matt Kulukundis a99b5feaf6 add release notes 2 years ago
Matt Kulukundis e8ab276325 Sync from Piper @465378928 2 years ago
Matt Kulukundis 7513a1743f Merge tag 'refs/tags/sync-piper' into sync-stage 2 years ago
Deanna Garcia 22a5690360 Remove SOVERSION from cmake files 2 years ago
Joshua Haberman a744c223a4
Merge pull request #10356 from haberman/php-containing-oneof 2 years ago
Craig Tiller 8b49ff0000
Remove bogus IWYU pragma 2 years ago
Joshua Haberman a8c600f900 Updated oneof count. 2 years ago
Joshua Haberman 763f08c620 [PHP] Added getContainingOneof and getRealContainingOneof to descriptor. 2 years ago
Deanna Garcia 15daef3b79 Use release version instead of libtool version 2 years ago
Mike Kruskal 8d3a732760
Adding shared library build test (#10351) 2 years ago
Matt Fowles Kulukundis 0d67dc7ded
Merge pull request #10354 from jskeet/xml-crefs 2 years ago
Jon Skeet 8448ab9fcf Fix XML comment warnings for JsonFormatter 2 years ago
Matt Fowles Kulukundis 449e21a350
Merge pull request #10320 from bshaffer/fix-readonly-with-nested-messages 2 years ago
Matt Fowles Kulukundis a6df0dbe35
Merge pull request #10350 from aucampia/patch-1 2 years ago
zhangskz c17b42fbd8
Fix typo in tests.cmake (use non-lite instead of lite) to fix Kokoro presubmit failure caught when DLL=ON. (#10337) 2 years ago
Matt Fowles Kulukundis eb95655721
Merge pull request #10341 from fowles/sync-stage 2 years ago
Iwan Aucamp 9b7ab18a13
docs: add protoc-gen-bq-schema 2 years ago
Matt Kulukundis e031663f29 Re-reremove extract_includes.bat.in 2 years ago
Matt Kulukundis cf540bd364 Merge tag 'refs/tags/sync-piper' into sync-stage 2 years ago
Matt Kulukundis c7b2991888 Sync from Piper @464784061 2 years ago
Matt Fowles Kulukundis adb5d60365
Merge pull request #10268 from tonydnewell/bugfix/issue-8101 2 years ago
Matt Fowles Kulukundis e46d9dac4a
Merge pull request #10340 from jskeet/parse-clarification 2 years ago
Jon Skeet 7beb116549 Clarify C# MessageParser and JSON parsing behavior 2 years ago
Matt Fowles Kulukundis 7b3e6cb3f2
Merge pull request #10339 from jskeet/merge-maps 2 years ago
Jon Skeet 71f4d7e682 Tests for new MapField behavior in generated messages 2 years ago
Jon Skeet a7dcf1b6c1 Regenerate C# protos 2 years ago
Jon Skeet 1d990dcb9c Make the C# generator use the new MapField.MergeFrom method in generated code 2 years ago
Jon Skeet 86fa35913d Add MapField.MergeFrom to merge maps without failing on duplicate keys 2 years ago
Mike Kruskal f3ebd8bb80
Add placeholders for further testing (#10336) 2 years ago
Matt Fowles Kulukundis a321b050f5
Merge pull request #10332 from zhangskz/benchmark 2 years ago
Sandy Zhang 05ba39a34f Revert third_party/benchmark changes from sync 2 years ago
zhangskz 53f7830b21
Merge pull request #10325 from zhangskz/sync-stage 2 years ago
Sandy Zhang 8de514f3f0 Remove rolled back change from changelog 2 years ago
Adam Cozzette c10963c571
Remove distcheck and dist_install Kokoro tests (#10326) 2 years ago
Sandy Zhang e6a2bf3890 Fix mispelling in comment supressed ==> suppressed in json_util_test.cc 2 years ago
Sandy Zhang 2712eb8133 Update changelog 2 years ago
Sandy Zhang c49b2245ae Merge tag 'refs/tags/sync-piper' into sync-stage 2 years ago
Sandy Zhang c003a02b59 Sync from Piper @463670061 2 years ago
zhangskz 1122a02024
Update python/release.sh to handle delay between twine upload and pip install (#10324) 2 years ago
Mike Kruskal 11a21d7297
Create placeholders for windows cmake builds (#10322) 2 years ago
NathanGrand 5999a02891 Fix Timestamps fromDate for negative 'exact second' java.sql.Timestamps 2 years ago
Brent Shaffer c752a43e1e fix: fix PHP readonly legacy files for nested messages 2 years ago
zhangskz 7cd0b6fbf1
Merge pull request #10318 from protocolbuffers/main-202207262015 2 years ago
zhangskz de48e9d03f
Merge pull request #10317 from protocolbuffers/21.x-202207262015 2 years ago
Mike Kruskal 78efa76172
Add CMake Ninja test (#10314) 2 years ago
Sandy Zhang fb421cb7ec Fix CHANGES.txt and delete .orig files from merge conflict 2 years ago
Sandy Zhang e347942f4b Merge 21.x into main 2 years ago
Sandy Zhang 735e1ef561 Update version.json to: 21.5-dev 2 years ago