protobuf - Protocol Buffers - Google's data interchange format

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \|	Rewrap the line	Dongjoon Hyun	2016-02-11	1	-2/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove redundant `the` in comments.	Dongjoon Hyun	2016-02-03	10	-11/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #997 from anderscarling/better_errors	Joshua Haberman	2016-02-11	3	-6/+47
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ruby: Better exception text for common cases
\| * \| \| \| \| \|	Invoke super implementation instead of raising error	Anders Carling	2015-11-23	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add field name to initialization map exceptions	Anders Carling	2015-11-20	3	-5/+22
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use same exception class in ruby and jruby	Anders Carling	2015-11-20	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Raise NoMethodError for unknown fields	Anders Carling	2015-11-20	3	-1/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More informative and more ruby-like
* \| \| \| \| \| \|	Merge pull request #1178 from lebauce/fix-readme-typos	Joshua Haberman	2016-02-11	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos in README.md
\| * \| \| \| \| \| \|	Fix typos in README.md	Sylvain Baubeau	2016-01-25	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1179 from ParthKolekar/python-examples-with	Joshua Haberman	2016-02-11	2	-9/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated python examples to use with.
\| * \| \| \| \| \| \| \|	Updated python examples to use with.	Parth Kolekar	2016-01-26	2	-9/+6
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #1194 from Photonios/master	Joshua Haberman	2016-02-11	6	-37/+37
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed unused parameters and extra ';'
\| * \| \| \| \| \| \| \|	Fixed unused parameters and extra ';'	Swen Kooij	2016-01-28	6	-37/+37
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1217 from jhump/jh/make-warning-useful	Joshua Haberman	2016-02-11	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make 'no syntax' warning useful by showing which file
\| * \| \| \| \| \| \| \| \|	make 'no syntax' warning useful by showing which file	Joshua Humphries	2016-02-06	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1218 from jskeet/nuspec-dependencies	Jan Tattermusch	2016-02-11	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \|	nuspec dependency fixes
\| * \| \| \| \| \| \| \| \|	nuspec dependency fixes	Jon Skeet	2016-02-08	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explicitly don't add any dependencies for "old" platforms, to avoid unnecessary dependencies in those cases. Fixes issue #1203.
* \| \| \| \| \| \| \| \| \|	Merge pull request #1225 from google/nmakedoc	Joshua Haberman	2016-02-10	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \|	Clarified that 'nmake' must be run before 'nmake check'.
\| * \| \| \| \| \| \| \| \|	Clarified that 'nmake' must be run before 'nmake check'.	Josh Haberman	2016-02-10	1	-1/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #1185 from kkm000/icl-fix	Joshua Haberman	2016-02-10	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Intel compiler warnings in include files on Windows
\| * \| \| \| \| \| \| \| \|	Fix Intel compiler warnings in include files on Windows	kkm	2016-01-27	2	-4/+4
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1220 from jtattermusch/add_strong_name_key	Jan Tattermusch	2016-02-10	4	-3/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check in strong name key.
\| * \| \| \| \| \| \| \| \|	Add a link	Jan Tattermusch	2016-02-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use checked-in key to build ReleaseSigned	Jan Tattermusch	2016-02-09	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	add private key for strong name assemblies	Jan Tattermusch	2016-02-09	2	-1/+5
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #1214 from haberman/binarygem	Joshua Haberman	2016-02-08	4	-8/+26
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|	Added support for binary gems.
\| * \| \| \| \| \| \| \|	Merge pull request #1 from nicolasnoble/bin-gems	Joshua Haberman	2016-02-05	2	-3/+9
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Few fixes.
\| \| * \| \| \| \| \| \| \|	Actually enabling cross compilation.	Nicolas "Pixel" Noble	2016-02-06	1	-1/+7
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Removing usage of git - not everyone grabs the gem using it.	Nicolas "Pixel" Noble	2016-02-06	1	-2/+2
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Add rake-compiler-dock as a dep.	Josh Haberman	2016-02-04	2	-3/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added support for binary gems.	Josh Haberman	2016-02-04	3	-3/+12
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1205 from haberman/fixjstests	Joshua Haberman	2016-02-05	3	-103/+3
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Enable JavaScript tests for binary parse/serialize.
\| * \| \| \| \| \| \|	Enable JavaScript tests for binary parse/serialize.	Josh Haberman	2016-02-02	3	-103/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These should have been included in the first match but I overlooked them. This involved deleting some of the code that tests Google-internal-only features.
* \| \| \| \| \| \| \|	Merge pull request #1213 from jskeet/rename-preconditions	Jon Skeet	2016-02-04	26	-142/+147
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename Preconditions to ProtoPreconditions
\| * \| \| \| \| \| \| \|	Generated code changes from previous commit	Jon Skeet	2016-02-04	11	-53/+53
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Rename Preconditions to ProtoPreconditions	Jon Skeet	2016-02-04	16	-89/+94
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(Generated code changes in next commit.)
* \| \| \| \| \| \| \|	Merge pull request #1210 from jskeet/rename-generatedcodeinfo	Jan Tattermusch	2016-02-04	25	-185/+495
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|	Rename GeneratedCodeInfo to GeneratedClrTypeInfo
\| * \| \| \| \| \| \|	Generated code for GeneratedCodeInfo change	Jon Skeet	2016-02-04	19	-168/+478
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rename GeneratedCodeInfo to GeneratedClrTypeInfo	Jon Skeet	2016-02-04	6	-17/+17
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Recently, descriptor.proto gained a GeneratedCodeInfo message, which means the generated code conflicts with our type. Unfortunately this affects codegen as well, although this is a part of the public API which is very unlikely to affect hand-written code. Generated code changes in next commit.
* \| \| \| \| \| \|	Merge pull request #1207 from jskeet/readme	Jie Luo	2016-02-03	1	-16/+32
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Clarify readme for C#
\| * \| \| \| \| \|	Clarify readme	Jon Skeet	2016-02-03	1	-16/+32
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #1165 from damienmg/master	Jisi Liu	2016-02-02	1	-6/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make protobuf Skylark extension appends the workspace root
\| * \| \| \| \| \|	Make protobuf Skylark extension appends the workspace root	Damien Martin-Guillerez	2016-01-15	1	-6/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change make protobuf skylark extension works when using remote repository. Note that this make the Skylark extension unusable prior to Bazel 0.1.4 because the workspace_root is not available on prior version. Tested with Bazel 0.1.4rc2. Fixes https://github.com/bazelbuild/bazel/issues/784.
* \| \| \| \| \| \|	Merge pull request #1195 from calbach/python-json-struct	Jie Luo	2016-02-01	5	-25/+659
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Manually down-integrate python JSON struct support from internal code base.
\| * \| \| \| \| \| \|	Manually down-integrate python JSON struct support from internal code base.	CH Albach	2016-01-29	5	-25/+659
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1199 from google/google_integrate	Jisi Liu	2016-02-01	27	-585/+2104
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Integrate google internal changes to master
\| * \| \| \| \| \|	Restore the license for Internal.java	Jisi Liu	2016-01-29	1	-1/+29
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Uncomment the test, which was commented out during integration	Jisi Liu	2016-01-29	1	-185/+184
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Integrate from google internal.	Jisi Liu	2016-01-29	157	-825/+2317
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration.
\| * \| \| \| \| \|	Undo the Java module change for integration.	Jisi Liu	2016-01-28	141	-0/+0
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.