aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #1742 from ottok/fix-spellingFeng Xiao2016-07-0640-68/+68
|\ \ \ \
| * | | | Fix spelling error in function ParseTime parameterOtto Kekäläinen2016-07-031-1/+1
| * | | | Fix spelling in strings and commentsOtto Kekäläinen2016-07-0339-67/+67
| | |/ / | |/| |
* | | | Merge pull request #1752 from acozzette/fix-js-testsAdam Cozzette2016-07-063-2/+486
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixed failing JS testsAdam Cozzette2016-07-063-2/+486
* | | | Merge pull request #1712 from dkharrat/swift-error-handlingThomas Van Lenten2016-07-062-21/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | add nullable qualifier to nil return typesDia Kharrat2016-07-052-21/+21
|/ / /
* | | Merge pull request #1704 from lizan/json_parse_optionsFeng Xiao2016-07-018-32/+214
|\ \ \ | |/ / |/| |
| * | Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-288-32/+214
* | | Merge pull request #1738 from xfxyjwf/fixbuildFeng Xiao2016-07-014-4/+67
|\ \ \
| * | | Fix some failing travis tests.Feng Xiao2016-07-014-4/+67
|/ / /
* | | Merge pull request #1710 from chezRong/masterFeng Xiao2016-07-012-26/+159
|\ \ \
| * | | added minified JSON formatting functionality with testchezRong2016-07-012-26/+159
* | | | Merge pull request #1723 from thomasvl/objc_test_coverageThomas Van Lenten2016-07-016-43/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Xcode project cleanup/setup.Thomas Van Lenten2016-06-296-43/+11
* | | | Fix windows build.Feng Xiao2016-06-302-7/+14
* | | | Updated failure_list_java.txt to remove tests that now passAdam Cozzette2016-06-301-2/+0
* | | | Fixed string formatting in text_format.py to be Python2.6-compatibleAdam Cozzette2016-06-301-2/+2
* | | | Integrated internal changes from GoogleAdam Cozzette2016-06-29216-5406/+13676
|/ / /
* | | Validate the tag numbers when parsing. (#1725)Thomas Van Lenten2016-06-295-4/+21
* | | Merge pull request #1720 from thomasvl/issue_1716Thomas Van Lenten2016-06-283-22/+72
|\ \ \ | |/ / |/| |
| * | Fix GPBGetMessage{Repeated,Map}Field()Thomas Van Lenten2016-06-273-22/+72
* | | Adding conditional compiler symbol to support .NET 3.5 (#1713)detlevschwabe2016-06-287-5/+36
* | | Merge pull request #1719 from esteluk/patch-1Thomas Van Lenten2016-06-271-1/+1
|\ \ \ | |/ / |/| |
| * | Fix Objective-C generator option typoNathan Wong2016-06-271-1/+1
|/ /
* | Merge pull request #1714 from dnkoutso/masterThomas Van Lenten2016-06-263-0/+26
|\ \
| * | Get value from text format name in GPBEnumDescriptorDimitris Koutsogiorgas2016-06-263-0/+26
* | | Merge pull request #1705 from haberman/revjsverJoshua Haberman2016-06-231-7/+9
|\ \ \
| * | | JS package.json: Added author and updated Closure Library version.Josh Haberman2016-06-231-3/+5
| * | | Moved all dependencies to devDependencies.Josh Haberman2016-06-221-6/+5
| * | | Add "google" to package.json "files" for WKT.Josh Haberman2016-06-221-0/+1
| * | | Create patch release for JS to include WKT.Josh Haberman2016-06-221-1/+1
| | |/ | |/|
* | | Merge pull request #1707 from jskeet/format-valueJan Tattermusch2016-06-232-25/+58
|\ \ \ | |/ / |/| |
| * | Expose JsonFormatter.WriteValue.Jon Skeet2016-06-232-25/+58
|/ /
* | Merge pull request #1700 from jskeet/orderingJon Skeet2016-06-211-3/+4
|\ \
| * | Remove ordering guarantees in the MapField documentationJon Skeet2016-06-211-3/+4
* | | Rename methods to avoid ObjC KVC collisions. (#1699)Thomas Van Lenten2016-06-2114-7325/+7448
|/ /
* | Adds destination flag to xcodebuild to avoid possible flake errors (#1697)Sergio Campamá2016-06-201-1/+6
* | Merge pull request #1666 from yeswalrus/cmake-prerelease-examplesFeng Xiao2016-06-172-15/+22
|\ \
| * | Fix prerelease version matching to be more consistent with the find_package a...Walter Gray2016-06-092-15/+22
* | | Merge pull request #1696 from haberman/jswktJoshua Haberman2016-06-172-5/+46
|\ \ \
| * | | Fix tests for CommonJS.Josh Haberman2016-06-161-2/+11
| * | | Added plugin.proto to well-known types for JS.Josh Haberman2016-06-161-0/+1
| * | | Bugfix: base the require logic on the file being required.Josh Haberman2016-06-161-4/+4
| * | | JS: import well-known types from google-protobuf package.Josh Haberman2016-06-162-2/+33
* | | | Add new generation option for using proto sources from other frameworks.Thomas Van Lenten2016-06-175-127/+348
* | | | Merge pull request #1692 from vjpai/friendlessFeng Xiao2016-06-161-4/+7
|\ \ \ \
| * | | | Address review comments on function namevjpai2016-06-161-2/+2
| * | | | Remove a friend-class template that is only used for theVijay Pai2016-06-151-4/+7
|/ / / /
* | | | Merge pull request #1658 from yeswalrus/cmake-fixup-moduleFeng Xiao2016-06-151-24/+9
|\ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 22:06:29 +0000