protobuf

Commit Graph

Author	SHA1	Message	Date
Matt Kulukundis	7513a1743f	Merge tag 'refs/tags/sync-piper' into sync-stage	2 years ago
Matt Kulukundis	e8ab276325	Sync from Piper @465378928 PROTOBUF_SYNC_PIPER	2 years ago
Joshua Haberman	a744c223a4	Merge pull request #10356 from haberman/php-containing-oneof [PHP] Added getContainingOneof and getRealContainingOneof to descriptor.	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
Mike Kruskal	8d3a732760	Adding shared library build test (#10351 )	2 years ago
Matt Fowles Kulukundis	0d67dc7ded	Merge pull request #10354 from jskeet/xml-crefs Fix XML comment warnings for JsonFormatter	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 fix: PHP readonly legacy files for nested messages	2 years ago
Matt Fowles Kulukundis	a6df0dbe35	Merge pull request #10350 from aucampia/patch-1 docs: add protoc-gen-bq-schema	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 Integrate from Piper for C++, Java, and Python	2 years ago
Iwan Aucamp	9b7ab18a13	docs: add protoc-gen-bq-schema Add protoc-gen-bq-schema to the list of third party add-ons.	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 PROTOBUF_SYNC_PIPER	2 years ago
Matt Fowles Kulukundis	adb5d60365	Merge pull request #10268 from tonydnewell/bugfix/issue-8101 Bugfix/issue 8101	2 years ago
Matt Fowles Kulukundis	e46d9dac4a	Merge pull request #10340 from jskeet/parse-clarification Clarify C# MessageParser and JSON parsing behavior	2 years ago
Jon Skeet	7beb116549	Clarify C# MessageParser and JSON parsing behavior Addresses #8316 as far as we want to.	2 years ago
Matt Fowles Kulukundis	7b3e6cb3f2	Merge pull request #10339 from jskeet/merge-maps Implement correct map merging behavior for C#	2 years ago
Jon Skeet	71f4d7e682	Tests for new MapField behavior in generated messages Before the change, one test passed (merging from a stream) and one failed (merging from another message object)	2 years ago
Jon Skeet	a7dcf1b6c1	Regenerate C# protos The only change is in generated MergeFrom methods for messages with map fields, which now call MapField.MergeFrom instead of Add.	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 This will enable message MergeFrom methods to implement the documented behavior.	2 years ago
Mike Kruskal	f3ebd8bb80	Add placeholders for further testing (#10336 ) * Fix comments in cmake test files * Add placeholder tests	2 years ago
Matt Fowles Kulukundis	a321b050f5	Merge pull request #10332 from zhangskz/benchmark Revert third_party/benchmark changes from sync	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 Integrate from Piper for C++, Java, and Python	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 ) These tests verify that various things can be built/installed/tested using our published distribution archives, but starting with 22.0 we will no longer be publishing those.	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 PROTOBUF_SYNC_PIPER	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
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 Merge 21.x into main	2 years ago
Mike Kruskal	78efa76172	Add CMake Ninja test (#10314 ) * Initial implementation of cmake tests for linux * Reverting accidental distcheck changes * Updating gitignore file to include cmake generated files * Updating existing cmake tests to use newer docker image * Adding CMake build that uses Ninja as the generator * Updating CMake documentation to cover Linux support * Updating to latest cmake image	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
Mike Kruskal	b5380c3c3e	Removing partial dependency of test common library on lite test utils (#10316 )	2 years ago
Alexander Neumann	30f273cb9b	cmake: use add_compile_options instead of add_definitions for compile options (#10293 )	2 years ago
Matt Fowles Kulukundis	b43e8cfb00	Merge pull request #9391 from datastack-net/feature/csharp-pretty-json Support indented JSON formatting in C#	2 years ago
Bouke Versteegh	69dcd1e475	Support indented JSON formatting in csharp	2 years ago
Mike Kruskal	3edec1f288	Implement cmake linux tests (#10306 ) * Initial implementation of cmake tests for linux * Reverting accidental distcheck changes * Deleting extract_includes.bat now that it's been replaced with the generated file_lists.cmake * Removing unnecessary endif conditions	2 years ago
zhangskz	3cc6b0145c	Merge pull request #10313 from protocolbuffers/21.x-202207252111 Merge 21.4 version update and changelog	2 years ago
Sandy Zhang	0ba022556e	Update changelog	2 years ago
Protobuf Team Bot	c9869dc780	Updating version.json and repo version numbers to: 21.4	2 years ago
Yash Tibrewal	c2548258b9	Reduce the required alignment of ArenaString from 8 to 4 (#10298 )	2 years ago

1 2 3 4 5 ...

9777 Commits (7513a1743f4d3f1e9d259483545b11c34ce82991) All Branches Search

9777 Commits (7513a1743f4d3f1e9d259483545b11c34ce82991)

All Branches