aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CocoaPod Integration TestsThomas Van Lenten2016-05-1923-0/+2063
| | | | | | | | - Add an Xcode 6.3 created default iOS Project. - Add an Xcode 6.3 created default OS X Project. - Add Podfiles to for both that use Protobufs from within the tree. - Add a script to run the tests (and cleanup) to help confirm the state of the Protobuf.podspec and sources.
* Expand the OS X/Xcode gitignoresThomas Van Lenten2016-05-192-7/+28
| | | | | - Add the folder CocoaPods will add to the root folder. - Move and expand the entries in the objectivec directory.
* Merge pull request #1549 from xyzzyz/arena_exportJoshua Haberman2016-05-181-1/+1
|\ | | | | Export class Arena to shared library.
| * Export class Arena to shared library.Adam Michalik2016-05-171-1/+1
| | | | | | | | | | This got broken in commit 6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e which integrated changes from internal branch.
* | Merge pull request #1547 from xyzzyz/js_generatorJoshua Haberman2016-05-181-1/+1
|\ \ | | | | | | Fix #include in js_generator.cc
| * | 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 #1559 from google/beta-3Jisi Liu2016-05-182-1/+2
|\ \ | | | | | | Merge beta-3 release branch again.
| * \ Merge pull request #1551 from pherl/beta-3Jisi Liu2016-05-171-1/+1
| |\ \ | | | | | | | | Fix protoc artifact pom version
| | * | Fix protoc artifact pom versionJisi Liu2016-05-171-1/+1
| | | |
| * | | Merge pull request #1546 from pherl/beta-3Jisi Liu2016-05-171-0/+1
| |\| | | | | | | | | | Added download_url to be able to upload to pypi.
| | * | Added download_url to be able to upload to pypi.Jisi Liu2016-05-171-0/+1
| |/ /
* | | Merge pull request #1412 from google/internalPaul Yang2016-05-182-1/+2
|\ \ \ | | | | | | | | Integrate interanl changes
| * | | Integrate interanl changesBo Yang2016-05-182-1/+2
|/ / /
* | | Merge pull request #1548 from anandolee/masterJoshua Haberman2016-05-172-1/+22
|\ \ \ | |_|/ |/| | JSON format for Any message must print @type first
| * | JSON format for Any message must print @type first, use OrderedDict instead ↵Jie Luo2016-05-172-1/+22
| | | | | | | | | | | | of {}
* | | 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
| | |/ / | |/| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 04:23:25 +0000