protobuf - Protocol Buffers - Google's data interchange format

	Commit message (Collapse)	Author	Age	Files	Lines
*	Down-integrate from google3.	Josh Haberman	2018-09-04	1	-3/+3
\|
*	Merge master branch.	Feng Xiao	2018-08-08	1	-4/+13
\|\
\| *	Ignore unknown enum received in json when ignoreUnknownFields flag is set ↵	vijay-bhatt	2018-07-30	1	-4/+13
\| \| \| \| \| \| \| \| \| \|	(#4825) * Ignore unknown enum received in json when ignoreUnknownFields flag is set.
* \|	Down-integrate from google3.	Feng Xiao	2018-08-08	1	-1/+1
\|/
*	Integrated internal changes from Google	Adam Cozzette	2017-12-01	1	-11/+46
\|
*	Integrated internal changes from Google	Adam Cozzette	2017-09-14	1	-1/+2
\|
*	Merge from Google internal for 3.4 release	Jisi Liu	2017-07-18	1	-1/+5
\|
*	Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master	Adam Cozzette	2017-04-27	1	-77/+99
\|\
\| *	Fix Java build.	Feng Xiao	2017-03-29	1	-2/+3
\| \|
\| *	Down-integrate from google3.	Feng Xiao	2017-03-29	1	-77/+98
\| \|
* \|	Fix error message for int64 parse error.	Anuraag Agrawal	2017-04-03	1	-1/+1
\|/
*	Don't expose gson exceptions in JsonFormat.	Feng Xiao	2017-03-09	1	-3/+18
\|
*	Merge pull request #2394 from cwelton/formatting	Feng Xiao	2016-12-08	1	-6/+13
\|\ \| \| \| \|	oneOf fix for JsonFormat includingDefaultValueFields
\| *	oneOf fix for JsonFormat includingDefaultValueFields	Caleb Welton	2016-12-05	1	-6/+13
\| \|
* \|	Integrated internal changes from Google	Adam Cozzette	2016-11-17	1	-11/+28
\|/
*	Integrate internal changes	Bo Yang	2016-10-10	1	-5/+10
\|
*	Allow the JsonFormat.Parser to ignore unknown fields	Dave Protasowski	2016-09-08	1	-6/+22
\| \| \| \|	The default behaviour of throwing an exception remains
*	Integrate from internal code base.	Feng Xiao	2016-07-13	1	-15/+25
\|
*	added minified JSON formatting functionality with test	chezRong	2016-07-01	1	-26/+101
\|
*	Integrated internal changes from Google	Adam Cozzette	2016-06-29	1	-386/+329
\| \| \| \|	This includes all internal changes from around May 20 to now.
*	Merge branch 'master' of github.com:google/protobuf	Jisi Liu	2016-03-30	1	-4/+3
\|\
\| *	Allow custom URLs for Any in JsonFormat	Pradeep Gollakota	2016-03-18	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \|	- Using custom URL for types in Any will no longer throw an InvalidProtocolBufferException in JsonFormat - Fixes #1128
* \|	Integrate google internal changes.	Jisi Liu	2016-03-30	1	-4/+22
\|/
*	Down-integrate from internal code base.	Feng Xiao	2015-12-11	1	-68/+158
\|
*	Merge Java util package to github.	Feng Xiao	2015-08-25	1	-0/+1571