Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream updates. #1

Merged
merged 18 commits into from
Jan 15, 2015
Merged

Conversation

curtiszimmerman
Copy link
Owner

Merge upstream.

bnoordhuis and others added 18 commits January 14, 2015 03:01
Nolens volens add back a 1024 bits Verisign Class 3 certificate that is
still in use by AWS S3.

Fixes: #402
Explicitly specify "https" over "http" for linked CSS. Fixup
indentation and quoting issues.

PR-URL: #379
Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
PR-URL: #382
Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
PR-URL: #410
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: #413
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: #425
Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
PR-URL: #397
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: #390
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR: #423
Reviewed-by: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-by: Bert Belder <bertbelder@gmail.com>
* Fetch from the correct url.
* Link compiled addons with iojs.lib instead of node.lib.
* Disable checksum checks for iojs.lib until our website supports
  them.

PR: #422
Reviewed-by: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-by: Rod Vagg <rod@vagg.org>
This allows node.js and io.js to be installed side-by-side.

PR: #431
Reviewed-by: Rod Vagg <rod@vagg.org>
Because the UpgradeCode changes with version 1.0.2, older versions won't
be uninstalled automatically. This patch puts a warning in the
installer.

PR: #431
Reviewed-by: Rod Vagg <rod@vagg.org>
Refer to https://iojs.org/ for documentation

PR-URL: #378
Reviewed-By: Rod Vagg <rod@vagg.org>
Added .on('end', callback) event to http.request example, because
for first sight it's not clear from http documentation, how to
handle end of request.

PR-URL: #447
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
OpenBSD doesn't define AI_V4MAPPED by default. Defining it to 0
as done with other ports.

PR-URL: #427
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Updated Makefile to remove special casing for those files, and
moved the files to doc/api_assets.

Fixes: nodejs/iojs.org#51
PR-URL: #409
Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
Current format does not render properly when converted to RTF by
the tools/license2rtf.js tool, specifically the wrong sections are
presented as bold, giving the wrong emphasis to the document.

This fix makes the formatting more consistent, with non-license
summary sections bold and the licenses themselves unformatted.

PR: #436
Reviewed-by: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-by: Bert Belder <bertbelder@gmail.com>
Use public `readableObjectMode` option to construct `Transform`
instead of accessing private `_readableState.objectMode`.

Partially addresses #445.

PR-URL: #270
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Bert Belder <bertbelder@gmail.com>
Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
curtiszimmerman added a commit that referenced this pull request Jan 15, 2015
Merge upstream updates.
@curtiszimmerman curtiszimmerman merged commit ce61ea4 into curtiszimmerman:v1.x Jan 15, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.