protobuf

Commit Graph

Author	SHA1	Message	Date
Thomas Van Lenten	7cf5b817cb	Merge pull request #1247 from thomasvl/xctool_plain_output Move the xctool use of -reporter into a common spot and always use "plain" to get more readable logs on travis.	9 years ago
Thomas Van Lenten	efca368939	Move the xctool use of -reporter into a common spot and always use "plain" to get more readable logs on travis.	9 years ago
Thomas Van Lenten	ee819ea724	Merge pull request #1245 from thomasvl/tweak_xctool_ios_run Tweak the xctool run for iOS tests to try and sort out flake	9 years ago
Thomas Van Lenten	30e645b6b6	Tweak the xctool run for iOS tests to try and sort out flake - Use the plain reporter for slightly more readable logs. - Add -newSimulatorInstance to the run-tests to see if it helps with flake.	9 years ago
Thomas Van Lenten	7d1cc109cf	Merge pull request #1244 from thomasvl/bump_xcode_version Bump up travis to Xcode 7.2	9 years ago
Thomas Van Lenten	1324119a42	Bump up travis to Xcode 7.2 - Update simulator versions used. - Mark the iOS tests as flaky while trying to dig out the root cause.	9 years ago
Paul Yang	e35e24800f	Merge pull request #1226 from jcanizales/patch-1 Include 'source' attribute in the podspec	9 years ago
Joshua Haberman	3ee2e20539	Merge pull request #1144 from dongjoon-hyun/remove_redundant_the Remove redundant `the`.	9 years ago
Dongjoon Hyun	86325d7c95	Rewrap the line	9 years ago
Joshua Haberman	caf1fb7197	Merge pull request #997 from anderscarling/better_errors ruby: Better exception text for common cases	9 years ago
Joshua Haberman	e088c2cf4b	Merge pull request #1178 from lebauce/fix-readme-typos Fix typos in README.md	9 years ago
Joshua Haberman	635ce854ed	Merge pull request #1179 from ParthKolekar/python-examples-with Updated python examples to use with.	9 years ago
Joshua Haberman	d2c7fe6bc5	Merge pull request #1194 from Photonios/master Fixed unused parameters and extra ';'	9 years ago
Joshua Haberman	655a9d667f	Merge pull request #1217 from jhump/jh/make-warning-useful make 'no syntax' warning useful by showing which file	9 years ago
Jan Tattermusch	2d3f79f7d6	Merge pull request #1218 from jskeet/nuspec-dependencies nuspec dependency fixes	9 years ago
Jorge Canizales	f492dd8aa4	Include 'source' attribute in the podspec The new version of Cocoapods requires it even when using the podspec locally.	9 years ago
Joshua Haberman	028d59fccd	Merge pull request #1225 from google/nmakedoc Clarified that 'nmake' must be run before 'nmake check'.	9 years ago
Josh Haberman	fe96a215d9	Clarified that 'nmake' must be run before 'nmake check'.	9 years ago
Joshua Haberman	a924e0b858	Merge pull request #1185 from kkm000/icl-fix Fix Intel compiler warnings in include files on Windows	9 years ago
Jan Tattermusch	18fba0f138	Merge pull request #1220 from jtattermusch/add_strong_name_key Check in strong name key.	9 years ago
Jan Tattermusch	95c4100230	Add a link	9 years ago
Jan Tattermusch	d40e3a1623	Use checked-in key to build ReleaseSigned	9 years ago
Jan Tattermusch	82f210cbac	add private key for strong name assemblies	9 years ago
Joshua Haberman	bc215089ca	Merge pull request #1214 from haberman/binarygem Added support for binary gems.	9 years ago
Jon Skeet	f1c5754f0f	nuspec dependency fixes Explicitly don't add any dependencies for "old" platforms, to avoid unnecessary dependencies in those cases. Fixes issue #1203.	9 years ago
Joshua Humphries	d740bc9bd1	make 'no syntax' warning useful by showing which file	9 years ago
Joshua Haberman	6efe3aaf3d	Merge pull request #1 from nicolasnoble/bin-gems Few fixes.	9 years ago
Nicolas "Pixel" Noble	bbb188acdd	Actually enabling cross compilation.	9 years ago
Nicolas "Pixel" Noble	4e141bb3b8	Removing usage of git - not everyone grabs the gem using it.	9 years ago
Joshua Haberman	0906f5d18a	Merge pull request #1205 from haberman/fixjstests Enable JavaScript tests for binary parse/serialize.	9 years ago
Josh Haberman	70a4b03086	Add rake-compiler-dock as a dep.	9 years ago
Josh Haberman	af4aa9bd64	Added support for binary gems.	9 years ago
Jon Skeet	bd8a476510	Merge pull request #1213 from jskeet/rename-preconditions Rename Preconditions to ProtoPreconditions	9 years ago
Jon Skeet	045b528d4a	Generated code changes from previous commit	9 years ago
Jon Skeet	7762f163a4	Rename Preconditions to ProtoPreconditions (Generated code changes in next commit.)	9 years ago
Jan Tattermusch	c78222a366	Merge pull request #1210 from jskeet/rename-generatedcodeinfo Rename GeneratedCodeInfo to GeneratedClrTypeInfo	9 years ago
Jon Skeet	b6159965ec	Generated code for GeneratedCodeInfo change	9 years ago
Jon Skeet	a3ea9d1203	Rename GeneratedCodeInfo to GeneratedClrTypeInfo 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.	9 years ago
Dongjoon Hyun	7a9040fe7f	Remove redundant `the` in comments.	9 years ago
Jie Luo	eb1d156d74	Merge pull request #1207 from jskeet/readme Clarify readme for C#	9 years ago
Jon Skeet	0809de8e9f	Clarify readme	9 years ago
Josh Haberman	5394fdb641	Enable JavaScript tests for binary parse/serialize. 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.	9 years ago
Jisi Liu	287a095c87	Merge pull request #1165 from damienmg/master Make protobuf Skylark extension appends the workspace root	9 years ago
Jie Luo	7727e2603c	Merge pull request #1195 from calbach/python-json-struct Manually down-integrate python JSON struct support from internal code base.	9 years ago
Jisi Liu	110e31cbbc	Merge pull request #1199 from google/google_integrate Integrate google internal changes to master	9 years ago
CH Albach	5477f8cdba	Manually down-integrate python JSON struct support from internal code base.	9 years ago
Jisi Liu	defa25b38b	Restore the license for Internal.java	9 years ago
Jisi Liu	1b8bab3a78	Uncomment the test, which was commented out during integration	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

1 2 3 4 5 ...

3176 Commits (7cf5b817cb38f96ee1c51e6c3b6f01e383370ebc) All Branches Search

3176 Commits (7cf5b817cb38f96ee1c51e6c3b6f01e383370ebc)

All Branches