| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #759 from TeBoring/beta-1-2v3.0.0-beta-1v3.0.0-alpha-4 | Feng Xiao | 2015-08-27 | 1 | -5/+19 |
| |\ | | | | | Fix Protobuf.podspec | ||||
| | * | Fix Protobuf.podspec | TeBoring | 2015-08-26 | 1 | -5/+19 |
| | | | |||||
| * | | Merge pull request #757 from xfxyjwf/python_failure | Jisi Liu | 2015-08-26 | 1 | -0/+7 |
| |\ \ | | | | | | | Excludes a failing python cpp test case. | ||||
| | * | | Excludes a failing python cpp test case. | Feng Xiao | 2015-08-26 | 1 | -0/+7 |
| |/ / | |||||
| * | | Make jruby use Java 3.0.0-alpha-3. | Feng Xiao | 2015-08-26 | 1 | -1/+1 |
| | | | |||||
| * | | Update generated file. | Feng Xiao | 2015-08-26 | 1 | -1/+0 |
| | | | |||||
| * | | Fix merge conflict. | Feng Xiao | 2015-08-26 | 1 | -1/+0 |
| | | | |||||
| * | | Merge pull request #756 from TeBoring/beta-1 | Feng Xiao | 2015-08-26 | 1 | -0/+1 |
| |\ \ | | | | | | | Add distribution for objc | ||||
| | * | | Add distribution for objc | Bo Yang | 2015-08-26 | 1 | -0/+2 |
| | | | | |||||
| * | | | Update Makefile.am to include missing files. | Feng Xiao | 2015-08-26 | 1 | -11/+45 |
| |\ \ \ | |_|/ |/| | | |||||
| | * | | Add missing files in dist. | Feng Xiao | 2015-08-26 | 1 | -1/+21 |
| | | | | |||||
| * | | | Merge pull request #755 from pherl/beta-1 | Jisi Liu | 2015-08-26 | 1 | -0/+3 |
| |\ \ \ | | | | | | | | | Add bazel build/workspace into distribution. | ||||
| | * | | | Add bazel build/workspace into distribution. | Jisi Liu | 2015-08-26 | 1 | -0/+3 |
| |/ / / | | | | | | | | | | Change-Id: I96fbe5c84a04f5d95c5484002404fc975f2abd21 | ||||
| * | | | Merge pull request #754 from xfxyjwf/changelog | Feng Xiao | 2015-08-26 | 1 | -0/+106 |
| |\ \ \ | |_|/ |/| | | Update change log for beta-1. | ||||
| | * | | Update change log for beta-1. | Feng Xiao | 2015-08-26 | 1 | -0/+106 |
| | | | | |||||
| * | | | Merge pull request #750 from TeBoring/beta-1 | Paul Yang | 2015-08-26 | 16 | -29/+457 |
| |\ \ \ | |/ / |/| | | Fix bugs for objectivec | ||||
| | * | | Fix bugs for objectivec | TeBoring | 2015-08-26 | 16 | -29/+457 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:google/protobuf into beta-1 | Feng Xiao | 2015-08-26 | 3 | -11/+27 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge pull request #728 from dano/py3_str_compat | Joshua Haberman | 2015-08-26 | 3 | -11/+27 |
| | |\ \ | | | | | | | | | Get all tests passing on Python3 (except Python3.4 cpp implementation) | ||||
| | | * | | Fix metaclass issue on Python 3. Get text handling tests passing on Python 3. | Dan O'Reilly | 2015-08-22 | 3 | -13/+9 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| | | * | | Start work on getting text handled properly on PY3 | Dan O'Reilly | 2015-08-22 | 1 | -7/+27 |
| | | | | | |||||
| * | | | | Update post_process_dist.sh | Feng Xiao | 2015-08-26 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | | vsproject files no longer exist. | ||||
| * | | | | Merge pull request #751 from xfxyjwf/version_number | Feng Xiao | 2015-08-26 | 10 | -14/+14 |
| |\ \ \ \ | | | | | | | | | | | Update version number. | ||||
| | * | | | | Update version number. | Feng Xiao | 2015-08-26 | 10 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other languages are updated to v3.0.0-alpha-4. | ||||
| * | | | | | Merge pull request #752 from google/jtattermusch-patch-1 | Feng Xiao | 2015-08-26 | 1 | -7/+12 |
| |\ \ \ \ \ | | | | | | | | | | | | | Update README.md for C# | ||||
| | * | | | | | Update README.md for C# | Jan Tattermusch | 2015-08-26 | 1 | -7/+12 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #749 from xfxyjwf/mingw_endian | Feng Xiao | 2015-08-26 | 1 | -2/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | Assume LITTLE_ENDIAN for windows build | ||||
| | * | | | | | Add a TODO to clean-up the LITTLE_ENDIAN macro. | Feng Xiao | 2015-08-26 | 1 | -0/+3 |
| | | | | | | | |||||
| | * | | | | | Assume LITTLE_ENDIAN for windows build. | Feng Xiao | 2015-08-26 | 1 | -2/+2 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #748 from xfxyjwf/unused_typedef | Feng Xiao | 2015-08-26 | 1 | -6/+0 |
| |\| | | | | | | | | | | | | | | Remove an unused typedef. | ||||
| | * | | | | Remove an unused typedef. | Feng Xiao | 2015-08-26 | 1 | -6/+0 |
| |/ / / / | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into beta-1 | Feng Xiao | 2015-08-26 | 2 | -1/+14 |
| |\| | | | |||||
| | * | | | Merge pull request #709 from xfxyjwf/map_bug | Feng Xiao | 2015-08-26 | 2 | -1/+14 |
| | |\ \ \ | | | | | | | | | | | Fix JSON map fields parsing. | ||||
| | | * | | | Fix map fields parsing. | Feng Xiao | 2015-08-11 | 2 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | | | Change-Id: If61e16cea84492474a71bbfe985131ec980b0b0a | ||||
| | * | | | | Merge pull request #739 from jtattermusch/include_descriptor_proto_master | Jon Skeet | 2015-08-26 | 1 | -0/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | include descriptor.proto in nuget package | ||||
| | | * | | | | include descriptor.proto in nuget package | Jan Tattermusch | 2015-08-25 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #747 from jtattermusch/sign_mismatch | Feng Xiao | 2015-08-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | add static cast to silence signedness comparison warning | ||||
| | * | | | | | | add static cast to silence signedness comparison warning | Jan Tattermusch | 2015-08-26 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #744 from xfxyjwf/cmake_linux | Feng Xiao | 2015-08-26 | 1 | -2/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix cmake build on linux. | ||||
| | * | | | | | | Fix cmake build on linux. | Feng Xiao | 2015-08-25 | 1 | -2/+4 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #736 from jtattermusch/fix-descriptor-proto | Jan Tattermusch | 2015-08-26 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Backport: Change where we rename Descriptor.cs to DescriptorProtoFile.cs. | ||||
| | * | | | | | | Remove extraneous TODO | Jon Skeet | 2015-08-25 | 1 | -1/+0 |
| | | | | | | | | |||||
| | * | | | | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs. | Jon Skeet | 2015-08-25 | 5 | -123/+122 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now do this in protoc instead of the generation simpler. Benefits: - Generation script is simpler - Detection is simpler as we now only need to care about one filename - The embedded descriptor knows itself as "google/protobuf/descriptor.proto" avoiding dependency issues This PR also makes the "invalid dependency" exception clearer in terms of expected and actual dependencies. | ||||
| * | | | | | | | Merge pull request #738 from jtattermusch/include_descriptor_proto | Jon Skeet | 2015-08-26 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Include descriptor.proto in nuget package | ||||
| | * | | | | | | include descriptor.proto in nuget package | Jan Tattermusch | 2015-08-25 | 1 | -0/+1 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #742 from xfxyjwf/c11_compile | Feng Xiao | 2015-08-25 | 2 | -3/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix compile issues with -std=c++11 | ||||
| | * | | | | | | Fix compile issues with -std=c++11 | Feng Xiao | 2015-08-25 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This compiles with -std=c++11: message Foo { map<string, Foo> value = 1; } This does not compile: message Foo { map<int32, Foo> value = 1; } Needs to dig more into the underlying issue. | ||||
| * | | | | | | | Merge pull request #741 from pherl/beta-1 | Jisi Liu | 2015-08-25 | 4 | -52/+72 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | fix "memory leaks" in protostream-object files. | ||||
| | * | | | | | | | fix "memory leaks" in protostream-object files. | Jisi Liu | 2015-08-25 | 4 | -52/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0aca56802d974cb03cb89c1a294f37068b5b9758 | ||||
| * | | | | | | | | Merge pull request #740 from pherl/beta-1 | Jisi Liu | 2015-08-25 | 1 | -5/+5 |
| |\| | | | | | | | |/ / / / / / |/| | | | | | | Fix commandline interface file under heapcheck. | ||||
 |
index : protobuf | |
| Protocol Buffers - Google's data interchange format |
| aboutsummaryrefslogtreecommitdiff |