aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix jenkins tests.Feng Xiao2016-11-152-1/+5
* Merge pull request #2323 from marcinwyszynski/masterJoshua Haberman2016-11-152-0/+54
|\
| * Move variable declarations before actual codeMarcin Wyszynski2016-11-141-2/+2
| * Fix copy pasta in testMarcin Wyszynski2016-11-031-1/+1
| * More Ruby-eqsue interfaceMarcin Wyszynski2016-11-032-0/+54
* | Merge pull request #1907 from evokly/js-utf8-fixJoshua Haberman2016-11-153-18/+71
|\ \
| * | JS: Well, this is the right place for surrogates.Wojciech Mandrysz2016-11-151-9/+11
| * | JS: Re-added comment, moved surrogates code to the right placeWojciech Mandrysz2016-11-152-9/+10
| * | JS: Replaced fromCodePoint/codePointAt with fromCharCode/charCodeAt because o...Wojciech Mandrysz2016-10-103-18/+24
| * | JS: Added string encoding/decoding tests for UTF-8Wojciech Mandrysz2016-10-031-0/+23
| * | JS: Fixed UTF-8 string encoder/decoder for high codepoints.Wojciech Mandrysz2016-10-032-15/+36
* | | Merge pull request #2366 from jbrianceau/reland-fix-include-js-generatorFeng Xiao2016-11-141-1/+1
|\ \ \
| * | | Fix #include in js_generator.ccJulien Brianceau2016-11-141-1/+1
* | | | Merge pull request #2368 from jbrianceau/fix-json-style-in-project-jsonFeng Xiao2016-11-141-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix csharp/src/Google.Protobuf.Test/project.jsonJulien Brianceau2016-11-141-1/+1
|/ / /
* | | Merge pull request #2364 from haberman/jslicenseJoshua Haberman2016-11-141-1/+1
|\ \ \
| * | | Fixed JavaScript license declaration.Josh Haberman2016-11-141-1/+1
|/ / /
* | | Merge pull request #2358 from ckennelly/masterFeng Xiao2016-11-111-15/+1
|\ \ \
| * | | Resolve old TODO for StringTypeHandler.Chris Kennelly2016-11-111-15/+1
|/ / /
* | | Merge pull request #2353 from guptasu/masterFeng Xiao2016-11-113-10/+27
|\ \ \
| * | | Made helper code also consider package name 'proto2' when dealing with Messag...guptasu2016-11-103-10/+27
* | | | Merge pull request #2357 from D3Hunter/masterFeng Xiao2016-11-111-1/+1
|\ \ \ \
| * | | | #2356 : fix ExceptionInInitializerError on IBM J9Time2016-11-111-1/+1
|/ / / /
* | | | Fix php c extension on 32-bit machines. (#2348)Paul Yang2016-11-107-17/+187
* | | | Merge pull request #2337 from sergiocampama/deprecationFeng Xiao2016-11-104-116/+120
|\ \ \ \ | |/ / / |/| | |
| * | | Fixing references to the removed atomicops_internals_pnacl.h file.Sergio Campama2016-11-102-112/+112
| * | | Renamed the pnacl version of atomicops.h into C11 atomic, and flagged the mac...Sergio Campama2016-11-072-4/+8
* | | | Merge pull request #2332 from Kwizatz/masterAdam Cozzette2016-11-091-1/+1
|\ \ \ \
| * | | | Added explicit cast to avoid size warning on Win64.Rodrigo Hernandez2016-11-041-1/+1
| |/ / /
* | | | Merge pull request #2327 from ctubbsii/fix-maven-compiler-pluginAdam Cozzette2016-11-095-14/+77
|\ \ \ \
| * | | | Use latest maven-compiler-plugin (2.6.0)Christopher Tubbs2016-11-045-14/+77
* | | | | Implement RepeatedFieldIter for c extension. (#2333)Paul Yang2016-11-085-3/+155
| |/ / / |/| | |
* | | | Merge pull request #2329 from acozzette/unused-parameterAdam Cozzette2016-11-041-0/+1
|\ \ \ \
| * | | | Fix unused parameter warnings in arena_freeAdam Cozzette2016-11-041-0/+1
| |/ / /
* | | | Merge pull request #2330 from manupsunny/masterJisi Liu2016-11-042-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix message for InvalidProtocolBufferExceptionMsp2016-11-042-2/+2
|/ / /
* | | Merge pull request #2301 from jbrianceau/arm-atomic-kuser-helpers-fix-v2Feng Xiao2016-11-031-0/+4
|\ \ \
| * | | [arm/gcc] Don't rely on KUSER_HELPERS feature for atomicsJulien Brianceau2016-10-281-0/+4
* | | | Update conformance test failure listJon Skeet2016-11-031-4/+0
* | | | Change JSON field name formattingJon Skeet2016-11-034-85/+23
| |_|/ |/| |
* | | Merge pull request #2302 from jbrianceau/generic-gcc-atomics-strong-cmpxchgJisi Liu2016-11-021-5/+5
|\ \ \
| * | | generic atomicops: Use strong compare_exchangeJulien Brianceau2016-10-281-5/+5
| |/ /
* | | Merge pull request #2318 from mavrukin/patch-1Feng Xiao2016-11-021-4/+4
|\ \ \
| * | | Fix compiler warnings when running :protobuf_testMichael Avrukin2016-11-021-4/+4
|/ / /
* | | Merge pull request #2307 from sinzianag/swift_protobufFeng Xiao2016-10-311-0/+1
|\ \ \
| * | | Adding Apple's Swift ProtobufSinziana Gafitanu2016-10-301-0/+1
* | | | Merge pull request #2309 from thomasvl/note_about_coding_supportThomas Van Lenten2016-10-311-1/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Add note about extension use and Coding support.Thomas Van Lenten2016-10-311-1/+10
|/ / /
* | | Adds pushLimit: and popLimit: into GPBCodedInputStream (#2297)Sergio Campamá2016-10-272-0/+29
* | | Trigger update of docker for new changes in #2282. (#2288)Paul Yang2016-10-272-0/+2