aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAgeFilesLines
* Replace repo links.Feng Xiao2018-08-222-5/+5
* Merge master branch.Feng Xiao2018-08-082-3/+3
|\
| * Merge pull request #4981 from BSBandme/fix_js_skipgroupYilun Chong2018-08-083-9/+21
| |\
| | * fixYilun Chong2018-08-011-1/+6
| | * fixYilun Chong2018-08-011-1/+6
| | * fixYilun Chong2018-08-011-2/+4
| | * fixYilun Chong2018-07-312-1/+1
| | * Fix js reader.js's skipGroupYilun Chong2018-07-313-8/+8
| * | Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-08-011-1/+1
| |\ \ | | |/ | |/|
| | * Updated version numbers to 3.6.1Adam Cozzette2018-07-271-1/+1
| * | Remove/replace travis references (#4953)Feng Xiao2018-07-221-1/+1
* | | Down-integrate from google3.Feng Xiao2018-08-088-38/+73
|/ /
* | Merge pull request #4299 from hekike/feat/add-commonjs-strict-import-styleJoshua Haberman2018-07-025-1/+163
|\ \ | |/ |/|
| * Fix strict JS generator with import in a protofilePeter Marton2018-05-084-6/+58
| * Test: cover import_style=commonjs_strictPeter Marton2018-05-083-1/+110
| * Feat: add import-style=commonjs_strict option to the compilerPeter Marton2018-05-081-0/+1
* | Fixed JS parsing of unspecified map keysAdam Cozzette2018-05-253-5/+82
* | Update version number to 3.6.0Jisi Liu2018-05-141-1/+1
|/
* Merge branch (#4466)Paul Yang2018-04-021-1/+1
* js message support for jstype string on integers (#4332)Charlie Moad2018-04-021-0/+11
* Merge branch 'master' into down-integrateAdam Cozzette2018-03-131-0/+4
|\
| * Revert "Removed mention of Buffer in byteSourceToUint8Array"Adam Cozzette2018-03-091-0/+4
* | Integrated internal changes from GoogleAdam Cozzette2018-03-138-51/+100
|/
* Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-1/+1
|\
| * Update version number to 3.5.1Jisi Liu2017-12-191-1/+1
* | Fixed failing JS testsAdam Cozzette2017-12-054-11/+3
* | Merge branch 'master' into down-integrateAdam Cozzette2017-12-011-1/+1
|\|
| * Update version number to 3.5.0Jisi Liu2017-11-021-1/+1
* | Integrated internal changes from GoogleAdam Cozzette2017-12-0111-103/+183
|/
* To be clear that we set a new variableStefan Huber2017-10-241-1/+1
* Merge from google internalJisi Liu2017-10-186-124/+72
* Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-111-1/+1
|\
| * Bump version for minor releaseJisi Liu2017-09-141-1/+1
| * Revert "Fix js conformance tests. (#3604)" (#3633)Paul Yang2017-09-134-15/+69
| * Fix js conformance tests. (#3604)Paul Yang2017-09-124-69/+15
* | Integrated internal changes from GoogleAdam Cozzette2017-09-146-8/+144
|/
* Update version number for 3.4.0Jisi Liu2017-07-241-1/+1
* remove broken imports in JSJisi Liu2017-07-191-2/+0
* Merge master into 3.4.xJisi Liu2017-07-184-15/+23
|\
| * Expand documentation in Readme.mddylanetaft2017-07-151-1/+9
| * Removed mention of Buffer in byteSourceToUint8ArrayAdam Cozzette2017-05-021-4/+0
| * Fix #1562 by using goog.crypt.byteArrayToString instead of String.fromCharCod...Paul Jolly2017-05-023-14/+14
* | Merge from Google internal for 3.4 releaseJisi Liu2017-07-1828-58/+5801
|/
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-2711-25/+69
|\
| * Update version number and changelog for 3.3.0Feng Xiao2017-04-051-1/+1
| * Down-integrate from google3.Feng Xiao2017-03-2910-24/+68
* | Added compatibility tests for version 3.0.0Adam Cozzette2017-04-0329-0/+5796
* | Split test protos into two groupsAdam Cozzette2017-04-032-9/+65
|/
* Merge pull request #1662 from haberman/jsconformanceJoshua Haberman2017-03-272-1/+5
|\
| * Added JavaScript conformance tests. All tests pass!Josh Haberman2017-03-062-1/+5