Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | Merge pull request #1483 from wal-rus/fix-boost-incompatibility | 2016-05-11 | ||
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix C++ Boost incompatibility on Windows/MSVC | |||
| | * | | | | | | Move test for standalone BoolValue to JsonParserTest | 2016-05-11 | ||
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added a standalone formatter test, for confidence. Have validated that undoing the change in 835fb947 breaks the tests (i.e. we are still testing that the change is required). | |||
* | | | | | | | Merge pull request #1517 from jhickson/boolvalue | 2016-05-11 | ||
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Fix C# Json parsing of well-known type Boolvalue | |||
| * | | | | | | Fixed parsing of BoolValue. | 2016-05-11 | ||
| | | | | | | | ||||
| * | | | | | | Merge remote-tracking branch 'refs/remotes/google/master' | 2016-05-11 | ||
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||
| | | * | | | | Merge pull request #1514 from pherl/fix_heap_check | 2016-05-10 | ||
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | Fix the command line interface unittest again | |||
| | | | | | * | | Initial draft for changelog. | 2016-05-10 | ||
| |_|_|_|_|/ / |/| | | | | | | ||||
| | | | * | | | Fix the command line interface unittest again | 2016-05-10 | ||
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | This time move the macro inside namespaces; hopefully will work with the integration script. | |||
| | | * | | | Merge pull request #1513 from pherl/fix-build-protoc | 2016-05-10 | ||
| |_|/| | | |/| | | | | | | | | | | | Fix protoc build artifact script. | |||
| | | * | | | Fix protoc build artifact script. | 2016-05-10 | ||
| |_|/ / / |/| | | | | | | | | | | | | | | pbconfig.h has gone. This commit removes the target. | |||
| | | * | | Update version numbers for other languages | 2016-05-10 | ||
| | | | | | ||||
| | | * | | Update version numbers for beta3 | 2016-05-10 | ||
| |_|/ / |/| | | | ||||
* | | | | Merge pull request #1510 from thomasvl/nonnull | 2016-05-10 | ||
|\ \ \ \ | | | | | | | | | | | Declare an init and avoid passing NULL to initWithValue:count: | |||
| * | | | | Declare an init and avoid passing NULL to initWithValue:count: | 2016-05-10 | ||
| | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/1189 | |||
* | | | | | Merge pull request #1498 from thomasvl/build_cleanup | 2016-05-09 | ||
|\ \ \ \ \ | |/ / / / |/| | | | | Build cleanup | |||
| | | * | | Remove confounding and unused #define - breaks boost/predef/other/endian.h | 2016-05-06 | ||
| | | | | | ||||
* | | | | | Merge pull request #1502 from pherl/master | 2016-05-06 | ||
|\ \ \ \ \ | | | | | | | | | | | | | Remove accidentally restored deleted files. | |||
| * | | | | | Remove accidentally restored deleted files. | 2016-05-06 | ||
| | | | | | | ||||
* | | | | | | Merge pull request #1494 from pherl/master | 2016-05-06 | ||
|\| | | | | | | | | | | | | | | | | | Fix the std::string error introduced in integration. | |||
* | | | | | | Merge pull request #1499 from beardedN5rd/master | 2016-05-06 | ||
|\ \ \ \ \ \ | | | | | | | | | | | | | | | updated README | |||
| * | | | | | | after comment of Feng Xiao changed the entry to g++ | 2016-05-06 | ||
| | | | | | | | ||||
* | | | | | | | Merge pull request #1496 from ozkuran/master | 2016-05-06 | ||
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Updated README.md | |||
| | | | * | | | | Add the missing maintiner-clean entry for benchmarks | 2016-05-06 | ||
| | | | | | | | | ||||
| | | | * | | | | Properly express all outputs for the conformance build | 2016-05-06 | ||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes up `make distclean` and `make maintainer-clean` - Fixes the build so make is more likely to notice if one of those files is stale/missing. | |||
| | | | * | | | | Add two missing ignores for conformance directory. | 2016-05-06 | ||
| |_|_|/ / / / |/| | | | | | | ||||
| | * | | | | | updated README | 2016-05-06 | ||
| | | | | | | | ||||
| * | | | | | | Updated README.md | 2016-05-06 | ||
|/ / / / / / | | | | | | | | | | | | | Added relative link to cmake guide. | |||
* | | | | | | Merge pull request #1471 from jskeet/any-host | 2016-05-06 | ||
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Allow custom type URL prefixes in Any.Pack | |||
| | | * | | | | Fix using std::shared_ptr | 2016-05-05 | ||
| | | | | | | | ||||
| | | * | | | | Fix the std::string error introduced in integration. | 2016-05-05 | ||
| |_|/ / / / |/| | | | | | ||||
* | | | | | | Merge pull request #1409 from eeight/fix_enum_corruption | 2016-05-04 | ||
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Fix bug with silent message corruption in LITE_RUNTIME. | |||
* | | | | | | Merge pull request #1482 from nicolasnoble/rake-tweaks-2 | 2016-05-03 | ||
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Properly generating well known proto files for the macos build. | |||
| * | | | | | | Properly generating well known proto files for the macos build. | 2016-05-04 | ||
|/ / / / / / | ||||
* | | | | | | Merge pull request #1464 from google/benchmarks | 2016-05-03 | ||
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added framework for generating/consuming benchmarking data sets. | |||
* \ \ \ \ \ \ | Merge pull request #1473 from nicolasnoble/rake-tweaks | 2016-05-03 | ||
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Few tweaks to the rakefile to permit native gems compilation with the proto files generation. | |||
| | * | | | | | Addressed PR comments. | 2016-05-03 | ||
| | | | | | | | ||||
* | | | | | | | Merge pull request #1467 from pherl/master | 2016-04-30 | ||
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Merge Google internal changes | |||
| | * | | | | | | Addressing concerns. | 2016-04-30 | ||
| | | | | | | | | ||||
| * | | | | | | | Update descritpor protos for objc | 2016-04-29 | ||
| | | | | | | | | ||||
* | | | | | | | | Merge pull request #1474 from pherl/fixscript | 2016-04-29 | ||
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix cp -r usage to be portable. | |||
| | * \ \ \ \ \ \ | Merge the script fix. | 2016-04-29 | ||
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||
| * | | | | | | | | Fix cp -r usage to be portable. | 2016-04-29 | ||
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cp -r foo/ bar/ in linux will create a bar/foo directoy. In the objectivec generate descritpor case, well known types will be created in objectivec/google/google/protobuf/.. if the command is run under linux. Adding the trailing period fixes the behavior inconsistency. | |||
| | * | | | | | | Few tweaks to the rakefile to permit native gems compilation with the proto ↵ | 2016-04-29 | ||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files generation. | |||
| | | * | | | | | Fixed for pre-C++11 ifstream which does not accept std::string. | 2016-04-29 | ||
| | | | | | | | | ||||
| | | * | | | | | Read files directly from filesystem since xxd isn't always available. | 2016-04-29 | ||
| | | | | | | | | ||||
| | | * | | | | | Make the C++ tests build the benchmarking code. | 2016-04-29 | ||
| | | | | | | | | ||||
| | | * | | | | | Updates for PR comments. | 2016-04-29 | ||
| | | | | | | | | ||||
| | | | | * | | | Allow custom type URL prefixes in Any.Pack | 2016-04-29 | ||
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (And likewise ignore the prefix in unpack.) Fixes issue #1459. | |||
| * | | | | | | Update file lists. | 2016-04-28 | ||
| | | | | | | | ||||
| * | | | | | | Merge branch 'master' of github.com:google/protobuf | 2016-04-28 | ||
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | |