Hao Nguyen
|
8ccdc44dde
|
Update GSON version
|
2019-06-17 13:20:44 -07:00 |
|
Hao Nguyen
|
634d704d23
|
Merge branch '3.8.x' into 3.8.x-201905311515
|
2019-05-31 15:18:39 -07:00 |
|
Hao Nguyen
|
010320f780
|
Add dependency to truth in test
|
2019-05-31 07:54:53 -07:00 |
|
Hao Nguyen
|
044c766fd4
|
Down integrate to GitHub
|
2019-05-30 13:31:15 -07:00 |
|
Hao Nguyen
|
b0d648664d
|
Update protobuf version
|
2019-05-21 14:07:13 -07:00 |
|
Hao Nguyen
|
2352a30e66
|
Revert "Update protobuf version"
This reverts commit 6d96493b31.
|
2019-05-21 13:49:06 -07:00 |
|
Hao Nguyen
|
6d96493b31
|
Update protobuf version
|
2019-05-21 13:31:01 -07:00 |
|
Hao Nguyen
|
76b4b4b331
|
Down integrate to GitHub
|
2019-04-30 15:30:49 -07:00 |
|
Hao Nguyen
|
37a89f8e1a
|
Update version to 3.8.0
|
2019-04-23 16:14:52 -07:00 |
|
Hao Nguyen
|
711e4b4d6c
|
Down integrate to GitHub
|
2019-04-22 17:12:12 -07:00 |
|
Hao Nguyen
|
6dc9832aab
|
Merge branch 'master' of https://github.com/protocolbuffers/protobuf into sync201904090622
|
2019-04-09 06:25:48 -07:00 |
|
Hao Nguyen
|
176f7db11d
|
Down integrate to Github
|
2019-04-09 06:23:32 -07:00 |
|
Hao Nguyen
|
c163a2d1a4
|
Revert accidentally commit
|
2019-04-05 17:09:42 -07:00 |
|
Hao Nguyen
|
86bc27d220
|
Merge branch 'master' of https://github.com/protocolbuffers/protobuf
|
2019-04-05 16:41:24 -07:00 |
|
Hao Nguyen
|
a48a574f7e
|
Down integrate to Github
|
2019-04-05 16:39:18 -07:00 |
|
Adam Cozzette
|
8645d893ab
|
Merge branch '3.7.x' into merge-3-7-x
|
2019-03-26 14:32:20 -07:00 |
|
Paul Yang
|
6973c3a504
|
Update version number to 3.7.1 (#5947)
* Update version number to 3.7.1
* Update version number in port_def.inc
|
2019-03-26 09:30:12 -07:00 |
|
Hao Nguyen
|
2f864fdfdf
|
Down integrate to Github
|
2019-03-20 11:45:01 -07:00 |
|
Bo Yang
|
cb6fa92ee8
|
Merge branch '3.7.x'
|
2019-03-04 10:18:18 -08:00 |
|
Paul Yang
|
582743bf40
|
Update version number to 3.7.0 (#5793)
* Update version number to 3.7.0
* Add php/releash.sh to Makefile.am
* Make cpp_distcheck exit on fail
|
2019-02-28 12:55:14 -08:00 |
|
Bo Yang
|
b52754b719
|
Update version to 3.7.0rc3
|
2019-02-22 11:31:48 -08:00 |
|
Xiang Dai
|
e479410564
|
delete all duplicate empty blanks (#5758)
Signed-off-by: Xiang Dai <764524258@qq.com>
|
2019-02-20 19:28:50 -08:00 |
|
Paul Yang
|
c7b3392201
|
Update version to 3.7.0 (#5749)
* Update version to 3.7.0
* Update version number for java bom
|
2019-02-19 15:54:45 -08:00 |
|
Adam Cozzette
|
1ee15baefc
|
Updated version to 3.7.0rc2
|
2019-01-30 21:08:04 -08:00 |
|
Adam Cozzette
|
0e3f1f4ad7
|
Fixed Javadoc errors
|
2019-01-30 13:25:58 -08:00 |
|
Hao Nguyen
|
d5be2baa46
|
Update version to 3.7.0
|
2019-01-24 10:23:02 -08:00 |
|
Bo Yang
|
624a40a387
|
Down-integrate internal changes to github.
|
2018-12-20 14:21:20 -08:00 |
|
Paul Yang
|
cecba296b8
|
Down-integrate internal changes (#5467)
* Down-integrate internal changes
* Update generated code for php, objc and csharp.
* Add missing dependency in conformance_php
|
2018-12-14 16:05:03 -08:00 |
|
Hao Nguyen
|
4b02f652e0
|
Make sure to add a new line at the end of XML files
|
2018-12-14 15:10:11 -08:00 |
|
Hao Nguyen
|
9349e23827
|
Replace update_version shell script with a python script, which is much better at handling XML rewrite. Update the PHP version too. As part of rewrite, some XML file format will change a little, but the semantics is still the same so it should be okay.
|
2018-12-14 15:05:48 -08:00 |
|
Adam Cozzette
|
46a48e49aa
|
Merge pull request #5332 from acozzette/integrate
Integrated internal changes from Google
|
2018-11-12 13:55:00 -08:00 |
|
Elliotte Rusty Harold
|
398a47b90b
|
java: add BOM (#5117)
|
2018-11-12 11:31:42 -08:00 |
|
Adam Cozzette
|
0894e07536
|
Integrated internal changes from Google
|
2018-11-09 11:28:22 -08:00 |
|
Josh Haberman
|
d61aede89c
|
Down-integrate from google3.
|
2018-09-04 10:58:54 -07:00 |
|
Feng Xiao
|
a8465b738e
|
Merge master branch.
|
2018-08-08 17:14:42 -07:00 |
|
Feng Xiao
|
6bbe197e9c
|
Down-integrate from google3.
|
2018-08-08 17:00:41 -07:00 |
|
Aleksej Kazmin
|
5ddc6874e4
|
Fix typo in FieldMaskTree.java warning
|
2018-08-07 17:46:34 +03:00 |
|
Adam Cozzette
|
94d55e5292
|
Merge branch '3.6.x' into merge-3-6-x
|
2018-08-01 13:44:55 -07:00 |
|
vijay-bhatt
|
0f56f27ffc
|
Ignore unknown enum received in json when ignoreUnknownFields flag is set (#4825)
* Ignore unknown enum received in json when ignoreUnknownFields flag is set.
|
2018-07-30 13:36:46 -07:00 |
|
Adam Cozzette
|
9e1286b949
|
Updated version numbers to 3.6.1
|
2018-07-27 13:30:28 -07:00 |
|
Jisi Liu
|
45eb28b588
|
Update version number to 3.6.0
|
2018-05-14 16:06:22 -07:00 |
|
Paul Yang
|
c931743461
|
Merge branch (#4466)
* Fix setup.py for windows build.
* Bump version number to 3.5.2
* Cat the test-suite.log on errors for presubits
|
2018-04-02 15:55:28 -07:00 |
|
kenji yoshida
|
1c3b20b122
|
fix typo in FieldMaskTree.java comment
|
2018-01-22 00:09:36 +09:00 |
|
Jisi Liu
|
383a4941d5
|
Merge remote-tracking branch 'origin/3.5.x' into master
|
2018-01-03 09:28:40 -08:00 |
|
Jisi Liu
|
050fc9a437
|
Update version number to 3.5.1
|
2017-12-19 11:00:33 -08:00 |
|
Adam Cozzette
|
0ba8eea655
|
Merge branch 'master' into down-integrate
|
2017-12-01 10:05:19 -08:00 |
|
Adam Cozzette
|
92a7e778e7
|
Integrated internal changes from Google
|
2017-12-01 10:05:10 -08:00 |
|
Jisi Liu
|
97dd175a91
|
Update version number to 3.5.0
|
2017-11-02 14:16:22 -07:00 |
|
Jisi Liu
|
1a7a7fca80
|
Merge from google internal
|
2017-10-18 12:22:18 -07:00 |
|
Jisi Liu
|
de15e73d58
|
Merge remote-tracking branch 'origin/3.4.x' into master
|
2017-10-11 14:44:03 -07:00 |
|