aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Add another test (javanano), but run it in parallel.Josh Haberman2016-03-022-5/+13
| * | | Properly add JDK deps in the Docker image.Josh Haberman2016-03-023-5/+19
| * | | Try running multiple tests in a row.Josh Haberman2016-03-024-51/+57
| * | | Added ccache support.Josh Haberman2016-03-024-6/+22
| * | | Added some initial shell scripts and docker file.Josh Haberman2016-03-027-39/+200
* | | | Merge pull request #1326 from the-alien/csharp_json_nameJon Skeet2016-03-306-9/+206
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'master' of https://github.com/google/protobuf into csharp_json_...alien2016-03-298-17/+39
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1358 from thomasvl/travis_tweaksThomas Van Lenten2016-03-292-7/+10
|\ \ \ \
| * | | | Mark iOS tests as able to fail.Thomas Van Lenten2016-03-292-7/+10
|/ / / /
* | | | Merge pull request #1350 from thomasvl/over_releaseThomas Van Lenten2016-03-241-2/+0
|\ \ \ \
| * | | | The message was autoreleased, the -releases are an over release.Thomas Van Lenten2016-03-241-2/+0
|/ / / /
* | | | Merge pull request #1345 from smparkes/smparkes/well-known-protosFeng Xiao2016-03-231-0/+6
|\ \ \ \
| * | | | export well known protosSteven Parkes2016-03-221-0/+6
|/ / / /
* | | | Merge pull request #1344 from topillar/patch-1Feng Xiao2016-03-221-1/+1
|\ \ \ \
| * | | | Update coded_stream.htopillar2016-03-221-1/+1
|/ / / /
* | | | Merge pull request #1335 from pradeepg26/masterFeng Xiao2016-03-211-4/+3
|\ \ \ \
| * | | | Allow custom URLs for Any in JsonFormatPradeep Gollakota2016-03-181-4/+3
* | | | | Merge pull request #1339 from thomasvl/delay_dispatch_semaphore_creationThomas Van Lenten2016-03-213-3/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Only create the readonlySemaphore on demand.Thomas Van Lenten2016-03-213-3/+19
|/ / / /
| * | | Code review fixesalien2016-03-295-7/+5
| * | | csharp: add support for the json_name optionalien2016-03-186-8/+207
|/ / /
* | | Merge pull request #1325 from thomasvl/shrink_overheadThomas Van Lenten2016-03-1758-5160/+1015
|\ \ \
| * | | Shrink ObjC overhead (generated size and some runtime sizes)Thomas Van Lenten2016-03-1758-5160/+1015
|/ / /
* | | Merge pull request #1318 from smparkes/smparkes/grpcFeng Xiao2016-03-142-0/+33
|\ \ \
| * | | add java/util support based on java/util/pom.xmlSteven Parkes2016-03-112-0/+33
* | | | Merge pull request #1291 from sergiocampama/develThomas Van Lenten2016-03-141-1/+2
|\ \ \ \
| * | | | Adds more information to Objective C error when the expected objc_class_prefi...Sergio Campama2016-03-031-1/+2
| | |/ / | |/| |
* | | | Merge pull request #1312 from petewarden/masterJisi Liu2016-03-121-2/+43
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge remote-tracking branch 'upstream/master'Pete Warden2016-03-0976-2393/+3886
| |\ \ \
| * | | | Added iOS settings to Bazel buildPete Warden2016-03-091-3/+19
| * | | | Updated library generation with iOS optionsPete Warden2016-02-231-2/+27
* | | | | Merge pull request #1278 from smparkes/masterJisi Liu2016-03-112-9/+27
|\ \ \ \ \
| * | | | | pass correct args to protoc for java wellknown protos when used as an externa...Steven Parkes2016-03-102-9/+27
| | |/ / / | |/| | |
* | | | | Merge pull request #1317 from benvanik/patch-1Feng Xiao2016-03-111-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixing compilation error when building with emscripten.Ben Vanik2016-03-111-1/+3
|/ / / /
* | | | Merge pull request #1299 from tatraian/masterFeng Xiao2016-03-081-1/+5
|\ \ \ \
| * | | | Comment has been added to fix (issue #1266)Antal Tátrai2016-03-081-0/+4
| * | | | Fix compiling clang/libc++ builds. (Issue: #1266)Antal Tátrai2016-03-051-1/+1
* | | | | Merge pull request #1309 from thomasvl/leading_special_prop_namesThomas Van Lenten2016-03-084-6/+40
|\ \ \ \ \
| * | | | | Fix up handing of fields with leading names that should be all caps.Thomas Van Lenten2016-03-084-6/+40
|/ / / / /
* | | | | Merge pull request #1306 from silviulica/masterJoshua Haberman2016-03-071-1/+1
|\ \ \ \ \
| * | | | | Update version to 3.0.0b2.post2Silviu Calinoiu2016-03-071-1/+1
* | | | | | Merge pull request #1304 from thomasvl/headerdocsThomas Van Lenten2016-03-0735-1363/+1985
|\ \ \ \ \ \
| * | | | | | HeaderDoc support in the library and generated sourcesThomas Van Lenten2016-03-0735-1363/+1985
|/ / / / / /
* | | | | | Merge pull request #1301 from avgweb/masterJon Skeet2016-03-075-131/+157
|\ \ \ \ \ \
| * | | | | | Replace StringBuilder with TextWriter in JsonFormatteravgweb2016-03-065-131/+157
|/ / / / / /
* | | | | | Merge pull request #1298 from craigcitro/fix_setupJoshua Haberman2016-03-051-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add back the namespace_packages arg in setup.py.Craig Citro2016-03-051-0/+1
|/ / / / /
* | | | | Merge pull request #1139 from haberman/rubyjsoncamelJoshua Haberman2016-03-048-676/+1172
|\ \ \ \ \
| * | | | | Updated upb from latest changes.Josh Haberman2016-02-182-244/+133