Chiebot-Mirror/protobuf - protobuf - Gitea: Git with a cup of tea

Author	SHA1	Message	Date
Feng Xiao	9086d96439	Integrate from internal code base.	9 years ago
chezRong	454dbf16fc	added minified JSON formatting functionality with test	9 years ago
Adam Cozzette	d64a2d9941	Integrated internal changes from Google This includes all internal changes from around May 20 to now.	9 years ago
Jisi Liu	cf14183bcd	Down integrate from Google internal.	9 years ago
Jisi Liu	3b3c8abb96	Integrate google internal changes.	9 years ago
Pradeep Gollakota	4d98369f6d	Allow custom URLs for Any in JsonFormat - Using custom URL for types in Any will no longer throw an InvalidProtocolBufferException in JsonFormat - Fixes #1128	9 years ago
Jisi Liu	5221dcbe47	Integrate from google internal. Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration.	9 years ago
Jisi Liu	cb3f428810	Undo the Java module change for integration. Moving the files to their original location, so that opensource changes can be picked during the internal merge. Those files will be moved into the correct location after merging with internal code. Note: do NOT merge this into master without the other internal down-integration commit.	9 years ago
nmittler	49efe9d7db	Restructuring protobuf to multiple modules protobuf/java will become a parent pom that will contain two modules: core - contains all of the code for the protobuf-java artifact util - contains all of the code for the protobuf-java-util artifact Also cleaned up various Maven warnings.	9 years ago
Feng Xiao	7d075a44c1	Update version number and fix javadoc errors.	9 years ago
Feng Xiao	13e1279d86	Remove internal options from proto files. Change-Id: I3daf32cb93dfe0fca38f8b48615ccfc307f748e9	9 years ago
Feng Xiao	e841bac4fc	Down-integrate from internal code base.	9 years ago
Feng Xiao	fbb3ef28c9	Merge Java util package to github.	10 years ago