3300 Commits (34d0cc220b88faf300036a41cb8bec2499c6339a)
 

Author SHA1 Message Date
Joshua Haberman 34d0cc220b Merge pull request #1295 from haberman/docker 9 years ago
Jon Skeet 261fde1707 Merge pull request #1326 from the-alien/csharp_json_name 9 years ago
Josh Haberman a15b916c41 Merge branch 'master' into docker 9 years ago
alien af34538aca Merge branch 'master' of https://github.com/google/protobuf into csharp_json_name 9 years ago
alien 6f8dd2115b Code review fixes 9 years ago
Thomas Van Lenten 261ee021f6 Merge pull request #1358 from thomasvl/travis_tweaks 9 years ago
Thomas Van Lenten 8d47d7873e Mark iOS tests as able to fail. 9 years ago
Thomas Van Lenten 9240acd179 Merge pull request #1350 from thomasvl/over_release 9 years ago
Thomas Van Lenten 3f917447e7 The message was autoreleased, the -releases are an over release. 9 years ago
Feng Xiao 812691227d Merge pull request #1345 from smparkes/smparkes/well-known-protos 9 years ago
Steven Parkes d5a573274d export well known protos 9 years ago
Feng Xiao 34eeeff640 Merge pull request #1344 from topillar/patch-1 9 years ago
topillar 64dfb5f80a Update coded_stream.h 9 years ago
Feng Xiao 698fa8ee22 Merge pull request #1335 from pradeepg26/master 9 years ago
Thomas Van Lenten 92091363cd Merge pull request #1339 from thomasvl/delay_dispatch_semaphore_creation 9 years ago
Thomas Van Lenten bd41a39f69 Only create the readonlySemaphore on demand. 9 years ago
Pradeep Gollakota 4d98369f6d Allow custom URLs for Any in JsonFormat 9 years ago
alien 0d32ab37fa csharp: add support for the json_name option 9 years ago
Thomas Van Lenten 5e933847cc Merge pull request #1325 from thomasvl/shrink_overhead 9 years ago
Thomas Van Lenten 79a23c435c Shrink ObjC overhead (generated size and some runtime sizes) 9 years ago
Feng Xiao ca3dc15d4c Merge pull request #1318 from smparkes/smparkes/grpc 9 years ago
Thomas Van Lenten 44fdead9d2 Merge pull request #1291 from sergiocampama/devel 9 years ago
Jisi Liu 9aea0ef0cd Merge pull request #1312 from petewarden/master 9 years ago
Steven Parkes a9244ca0df add java/util support based on java/util/pom.xml 9 years ago
Jisi Liu c71f1847c8 Merge pull request #1278 from smparkes/master 9 years ago
Feng Xiao dfaf1aac30 Merge pull request #1317 from benvanik/patch-1 9 years ago
Ben Vanik 58f07644ea Fixing compilation error when building with emscripten. 9 years ago
Steven Parkes ea1886661e pass correct args to protoc for java wellknown protos when used as an external repository 9 years ago
Pete Warden bc2d6c2504 Merge remote-tracking branch 'upstream/master' 9 years ago
Pete Warden f0c1a86372 Added iOS settings to Bazel build 9 years ago
Feng Xiao 48ebb29a8e Merge pull request #1299 from tatraian/master 9 years ago
Antal Tátrai e2fb1d9822 Comment has been added to fix (issue #1266) 9 years ago
Thomas Van Lenten a8db268d8f Merge pull request #1309 from thomasvl/leading_special_prop_names 9 years ago
Thomas Van Lenten 1bf4b38f29 Fix up handing of fields with leading names that should be all caps. 9 years ago
Joshua Haberman 3dd3238189 Merge pull request #1306 from silviulica/master 9 years ago
Silviu Calinoiu 4573edba76 Update version to 3.0.0b2.post2 9 years ago
Thomas Van Lenten 6a8815bef9 Merge pull request #1304 from thomasvl/headerdocs 9 years ago
Thomas Van Lenten 36650a07cf HeaderDoc support in the library and generated sources 9 years ago
Jon Skeet f2d3408676 Merge pull request #1301 from avgweb/master 9 years ago
avgweb ad2d775e1b Replace StringBuilder with TextWriter in JsonFormatter 9 years ago
Joshua Haberman 9242d9b7f4 Merge pull request #1298 from craigcitro/fix_setup 9 years ago
Antal Tátrai 3cc35adb6d Fix compiling clang/libc++ builds. (Issue: #1266) 9 years ago
Craig Citro 0e7c0c2fb8 Add back the namespace_packages arg in setup.py. 9 years ago
Joshua Haberman e70f9256af Merge pull request #1139 from haberman/rubyjsoncamel 9 years ago
Josh Haberman 67c727cd41 Rearranged and commented files for running under Jenkins. 9 years ago
Joshua Haberman 37663e861b Merge pull request #1292 from haberman/ruby-allow-descriptor 9 years ago
Josh Haberman 35227b4f31 Removed the generated Ruby file from Makefile.am. 9 years ago
Josh Haberman 7d793c167f Disable attempt to use ccache for docker build. 9 years ago
Josh Haberman 2bda98f79c Properly report C++ build time. 9 years ago
Josh Haberman 1ee0fda556 Use a local Maven repository to avoid network fetches during tests. 9 years ago