aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix #include in js_generator.ccAdam Michalik2016-05-171-1/+1
| | | | | The commit 3b3c8abb9635eb3ea078a821a99c9ef29d66dff7 has replaced the <> with "" in #include statement in js_generator.cc
* Merge pull request #1542 from google/beta-3Jisi Liu2016-05-1616-23/+206
|\ | | | | Merge Beta 3 release branch into master
| * Merge pull request #1540 from pherl/changelogv3.0.0-beta-3Jisi Liu2016-05-161-2/+8
| |\ | | | | | | Update changes for lite
| | * Update changes for liteJisi Liu2016-05-161-2/+8
| | |
| * | Merge pull request #1533 from pherl/mapcommentJisi Liu2016-05-161-3/+1
| |\ \ | | | | | | | | Remove the comments about iterator validation
| | * | Remove the comments about iterator validationJisi Liu2016-05-131-3/+1
| |/ / | | | | | | | | | As it may be implementation dependent.
| * | Merge pull request #1532 from pherl/changelogJisi Liu2016-05-131-1/+6
| |\| | | | | | | Update changelogs for C++ maps
| | * Update changelogs for C++ mapsJisi Liu2016-05-131-1/+6
| |/
| * Merge pull request #1527 from haberman/changelogJisi Liu2016-05-121-1/+14
| |\ | | | | | | Added release notes for Ruby and JavaScript.
| | * Added release notes for Ruby and JavaScript.Josh Haberman2016-05-121-1/+14
| |/
| * Merge pull request #1520 from pherl/hashmapvs2008Jisi Liu2016-05-121-3/+55
| |\ | | | | | | Bridge vs2008 hashmaps.
| | * Bridge vs2008 hashmaps.Jisi Liu2016-05-111-3/+55
| | |
| * | Merge pull request #1524 from anandolee/masterJisi Liu2016-05-121-1/+5
| |\ \ | | | | | | | | python changes
| | * | python changesJie Luo2016-05-111-1/+5
| | | |
| | * | Merge pull request #1 from google/beta-3Jie Luo2016-05-11862-26667/+104755
| | |\ \ | | |/ / | |/| | Beta 3
| * | | Merge pull request #1515 from pherl/changelog-beta3Jisi Liu2016-05-111-0/+104
| |\ \ \ | | | | | | | | | | Initial draft for changelog.
| | * | | Update comments for csharp, zero-copy and objc.Jisi Liu2016-05-111-3/+55
| | | | |
| | * | | Fix typo.Jisi Liu2016-05-111-1/+1
| | | | |
| | * | | Initial draft for changelog.Jisi Liu2016-05-101-0/+52
| | | |/ | | |/|
| * | | Merge pull request #1512 from pherl/beta-3Jisi Liu2016-05-1112-14/+14
| |\ \ \ | | | | | | | | | | Update version numbers for beta3
| | * | | Fix csharp versionJisi Liu2016-05-111-1/+1
| | | | |
| | * | | Update version numbers for other languagesJisi Liu2016-05-108-10/+10
| | | | |
| | * | | Update version numbers for beta3Jisi Liu2016-05-103-3/+3
| | |/ /
| * | | Merge pull request #1514 from pherl/fix_heap_checkJisi Liu2016-05-101-3/+4
| |\ \ \ | | | | | | | | | | Fix the command line interface unittest again
| | * | | Fix the command line interface unittest againJisi Liu2016-05-101-3/+4
| | |/ / | | | | | | | | | | | | | | | | This time move the macro inside namespaces; hopefully will work with the integration script.
| * | | Merge pull request #1513 from pherl/fix-build-protocJisi Liu2016-05-101-1/+1
| |\ \ \ | | |/ / | |/| | Fix protoc build artifact script.
| | * | Fix protoc build artifact script.Jisi Liu2016-05-101-1/+1
| |/ / | | | | | | | | | pbconfig.h has gone. This commit removes the target.
* | | Merge pull request #1529 from gkraynov/test-redundant-varintJoshua Haberman2016-05-131-0/+52
|\ \ \ | | | | | | | | Test redundant varint fields decoding in JS.
| * | | Test redundant varint fields decoding in JS.Grigoriy Kraynov2016-05-121-0/+52
| | | | | | | | | | | | | | | | | | | | Varints are generally encoded in minimum possible length but need to ensure that any redundancy does not break fields decoder.
* | | | Merge pull request #1528 from pherl/masterJisi Liu2016-05-131-4/+1
|\ \ \ \ | | | | | | | | | | Remove the instructions for pbconfig.h
| * | | | Remove the instructions for pbconfig.hJisi Liu2016-05-121-4/+1
|/ / / /
* | | | Merge pull request #1521 from zhangkun83/masterJisi Liu2016-05-122-5/+23
|\ \ \ \ | | | | | | | | | | Fine-tune build scripts and better documentation.
| * | | | Fix the server id in exampleKun Zhang2016-05-121-1/+1
| | | | |
| * | | | Fine-tune build scripts and better documentation.Kun Zhang2016-05-112-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "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 #1522 from xfxyjwf/compatibility_noticeJisi Liu2016-05-121-30/+55
|\ \ \ \ \ | |_|/ / / |/| | | | Add compatibility notice for Java.
| * | | | Add compatibility notice for Java.Feng Xiao2016-05-111-30/+55
| | |/ / | |/| |
* | | | Merge pull request #1518 from jskeet/move_testJon Skeet2016-05-123-7/+19
|\ \ \ \ | |_|/ / |/| | | Move test for standalone BoolValue to JsonParserTest
| * | | Move test for standalone BoolValue to JsonParserTestJon Skeet2016-05-113-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | 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 #1483 from wal-rus/fix-boost-incompatibilityFeng Xiao2016-05-111-3/+1
|\ \ \ \ | |/ / / |/| | | Fix C++ Boost incompatibility on Windows/MSVC
| * | | Remove confounding and unused #define - breaks boost/predef/other/endian.hWalter Gray2016-05-061-3/+1
| | | |
* | | | Merge pull request #1517 from jhickson/boolvalueJon Skeet2016-05-112-1/+9
|\ \ \ \ | |_|/ / |/| | | Fix C# Json parsing of well-known type Boolvalue
| * | | Fixed parsing of BoolValue.Jos Hickson2016-05-112-1/+9
| | | |
| * | | Merge remote-tracking branch 'refs/remotes/google/master'Jos Hickson2016-05-11566-16468/+52048
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1510 from thomasvl/nonnullv3.0.0-beta-3-pre-1Thomas Van Lenten2016-05-102-65/+90
|\ \ \ \ | | | | | | | | | | Declare an init and avoid passing NULL to initWithValue:count:
| * | | | Declare an init and avoid passing NULL to initWithValue:count:Thomas Van Lenten2016-05-102-65/+90
| | | | | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/1189
* | | | | Merge pull request #1498 from thomasvl/build_cleanupJoshua Haberman2016-05-093-3/+110
|\ \ \ \ \ | |/ / / / |/| | | | Build cleanup
| * | | | Add the missing maintiner-clean entry for benchmarksThomas Van Lenten2016-05-061-0/+3
| | | | |
| * | | | Properly express all outputs for the conformance buildThomas Van Lenten2016-05-061-3/+105
| | | | | | | | | | | | | | | | | | | | | | | | | - 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.Thomas Van Lenten2016-05-061-0/+2
| | | | |
* | | | | Merge pull request #1502 from pherl/masterJisi Liu2016-05-066-1492/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove accidentally restored deleted files.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 15:27:13 +0000