aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
| | * | Update changelogs for C++ mapsGravatar Jisi Liu2016-05-13
| |/ /
* | | Merge pull request #1529 from gkraynov/test-redundant-varintGravatar Joshua Haberman2016-05-13
|\ \ \ | | | | | | | | Test redundant varint fields decoding in JS.
* \ \ \ Merge pull request #1528 from pherl/masterGravatar Jisi Liu2016-05-13
|\ \ \ \ | | | | | | | | | | Remove the instructions for pbconfig.h
| | | * \ Merge pull request #1527 from haberman/changelogGravatar Jisi Liu2016-05-12
| | | |\ \ | | | | | | | | | | | | Added release notes for Ruby and JavaScript.
| | | | * | Added release notes for Ruby and JavaScript.Gravatar Josh Haberman2016-05-12
| | | |/ /
| * | / / Remove the instructions for pbconfig.hGravatar Jisi Liu2016-05-12
|/ / / /
* | | | Merge pull request #1521 from zhangkun83/masterGravatar Jisi Liu2016-05-12
|\ \ \ \ | | | | | | | | | | Fine-tune build scripts and better documentation.
| * | | | Fix the server id in exampleGravatar Kun Zhang2016-05-12
| | | | |
| | | * | Merge pull request #1520 from pherl/hashmapvs2008Gravatar Jisi Liu2016-05-12
| | | |\ \ | | | | | | | | | | | | Bridge vs2008 hashmaps.
* | | | \ \ Merge pull request #1522 from xfxyjwf/compatibility_noticeGravatar Jisi Liu2016-05-12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add compatibility notice for Java.
| | | | * \ \ Merge pull request #1524 from anandolee/masterGravatar Jisi Liu2016-05-12
| | | | |\ \ \ | | | | | | |/ | | | | | |/| python changes
| | | * | / | Test redundant varint fields decoding in JS.Gravatar Grigoriy Kraynov2016-05-12
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Varints are generally encoded in minimum possible length but need to ensure that any redundancy does not break fields decoder.
* | | | | | Merge pull request #1518 from jskeet/move_testGravatar Jon Skeet2016-05-12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move test for standalone BoolValue to JsonParserTest
| | | | | * | python changesGravatar Jie Luo2016-05-11
| | | | | | |
| | * | | | | Add compatibility notice for Java.Gravatar Feng Xiao2016-05-11
| | | | | | |
| | | * | | | Fine-tune build scripts and better documentation.Gravatar Kun Zhang2016-05-11
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "make google/protobuf/stubs/pbconfig.h" was added in hope of addressing the issue that when you "make protoc" from a freshly checked out project, pbconfig.h will be reported missing. However, the trick doesn't seem to work. Instead, add instructions in the document to work the issue around. Also document why MSYS2 cannot be used for publishing protoc.
| | | | * | Merge pull request #1 from google/beta-3Gravatar Jie Luo2016-05-11
| | | | |\ \ | | | | |/ / | | | |/| | Beta 3
| | | * | | Merge pull request #1515 from pherl/changelog-beta3Gravatar Jisi Liu2016-05-11
| | | |\ \ \ | | | | | | | | | | | | | | Initial draft for changelog.
| | | | * | | Update comments for csharp, zero-copy and objc.Gravatar Jisi Liu2016-05-11
| | | | | | |
| | | * | | | Merge pull request #1512 from pherl/beta-3Gravatar Jisi Liu2016-05-11
| | | |\ \ \ \ | | | | | | | | | | | | | | | | Update version numbers for beta3
| | | | * | | | Fix csharp versionGravatar Jisi Liu2016-05-11
| | | | | | | |
| | | | | | | * Bridge vs2008 hashmaps.Gravatar Jisi Liu2016-05-11
| | | |_|_|_|/ | | |/| | | |
| | | | | * | Fix typo.Gravatar Jisi Liu2016-05-11
| | | | | | |
* | | | | | | Merge pull request #1483 from wal-rus/fix-boost-incompatibilityGravatar Feng Xiao2016-05-11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix C++ Boost incompatibility on Windows/MSVC
| | * | | | | | Move test for standalone BoolValue to JsonParserTestGravatar Jon Skeet2016-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/boolvalueGravatar Jon Skeet2016-05-11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fix C# Json parsing of well-known type Boolvalue
| * | | | | | Fixed parsing of BoolValue.Gravatar Jos Hickson2016-05-11
| | | | | | |
| * | | | | | Merge remote-tracking branch 'refs/remotes/google/master'Gravatar Jos Hickson2016-05-11
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| | | * | | | Merge pull request #1514 from pherl/fix_heap_checkGravatar Jisi Liu2016-05-10
| | | |\ \ \ \ | | | | | | | | | | | | | | | | Fix the command line interface unittest again
| | | | | | * | Initial draft for changelog.Gravatar Jisi Liu2016-05-10
| |_|_|_|_|/ / |/| | | | | |
| | | | * | | Fix the command line interface unittest againGravatar Jisi Liu2016-05-10
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | This time move the macro inside namespaces; hopefully will work with the integration script.
| | | * | | Merge pull request #1513 from pherl/fix-build-protocGravatar Jisi Liu2016-05-10
| |_|/| | | |/| | | | | | | | | | | Fix protoc build artifact script.
| | | * | | Fix protoc build artifact script.Gravatar Jisi Liu2016-05-10
| |_|/ / / |/| | | | | | | | | | | | | | pbconfig.h has gone. This commit removes the target.
| | | * | Update version numbers for other languagesGravatar Jisi Liu2016-05-10
| | | | |
| | | * | Update version numbers for beta3Gravatar Jisi Liu2016-05-10
| |_|/ / |/| | |
* | | | Merge pull request #1510 from thomasvl/nonnullGravatar Thomas Van Lenten2016-05-10
|\ \ \ \ | | | | | | | | | | Declare an init and avoid passing NULL to initWithValue:count:
| * | | | Declare an init and avoid passing NULL to initWithValue:count:Gravatar Thomas Van Lenten2016-05-10
| | | | | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/1189
* | | | | Merge pull request #1498 from thomasvl/build_cleanupGravatar Joshua Haberman2016-05-09
|\ \ \ \ \ | |/ / / / |/| | | | Build cleanup
| | | * | Remove confounding and unused #define - breaks boost/predef/other/endian.hGravatar Walter Gray2016-05-06
| | | | |
* | | | | Merge pull request #1502 from pherl/masterGravatar Jisi Liu2016-05-06
|\ \ \ \ \ | | | | | | | | | | | | Remove accidentally restored deleted files.
| * | | | | Remove accidentally restored deleted files.Gravatar Jisi Liu2016-05-06
| | | | | |
* | | | | | Merge pull request #1494 from pherl/masterGravatar Jisi Liu2016-05-06
|\| | | | | | | | | | | | | | | | | Fix the std::string error introduced in integration.
* | | | | | Merge pull request #1499 from beardedN5rd/masterGravatar Feng Xiao2016-05-06
|\ \ \ \ \ \ | | | | | | | | | | | | | | updated README
| * | | | | | after comment of Feng Xiao changed the entry to g++Gravatar beardedn5rd2016-05-06
| | | | | | |
* | | | | | | Merge pull request #1496 from ozkuran/masterGravatar Feng Xiao2016-05-06
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Updated README.md
| | | | * | | | Add the missing maintiner-clean entry for benchmarksGravatar Thomas Van Lenten2016-05-06
| | | | | | | |
| | | | * | | | Properly express all outputs for the conformance buildGravatar Thomas Van Lenten2016-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.Gravatar Thomas Van Lenten2016-05-06
| |_|_|/ / / / |/| | | | | |
| | * | | | | updated READMEGravatar beardedn5rd2016-05-06
| | | | | | |
| * | | | | | Updated README.mdGravatar Mahmut Ali ÖZKURAN2016-05-06
|/ / / / / / | | | | | | | | | | | | Added relative link to cmake guide.