Merge branch 'release-1.1'

rastabrane · Mar 31, 2015 · b5f1ed8 · b5f1ed8
2 parents 0b2d6b4 + 5856c6d
commit b5f1ed8
Show file tree

Hide file tree

Showing 149 changed files with 37,621 additions and 6,193 deletions.
diff --git a/.mailmap b/.mailmap
@@ -80,6 +80,7 @@ GITHUB: mitar <[email protected]>
 GITHUB: mizzao <[email protected]>
 GITHUB: mquandalle <[email protected]>
 GITHUB: mquandalle <[email protected]>
+GITHUB: murillo128 <[email protected]>
 GITHUB: musically-ut <[email protected]>
 GITHUB: nathan-muir <[email protected]>
 GITHUB: Neftedollar <[email protected]>
@@ -107,6 +108,7 @@ GITHUB: RichardLitt <[email protected]>
 GITHUB: richguan <[email protected]>
 GITHUB: rick-golden-healthagen <[email protected]>
 GITHUB: rissem <[email protected]>
+GITHUB: rjakobsson <[email protected]>
 GITHUB: RobertLowe <[email protected]>
 GITHUB: romanzolotarev <[email protected]>
 GITHUB: rosh93 <[email protected]>
@@ -148,6 +150,7 @@ METEOR: gschmidt <[email protected]>
 METEOR: justinsb <[email protected]>
 METEOR: karayu <[email protected]>
 METEOR: mariapacana <[email protected]>
+METEOR: multilinear <[email protected]>
 METEOR: n1mmy <[email protected]>
 METEOR: sixolet <[email protected]>
 METEOR: Slava <[email protected]>

diff --git a/History.md b/History.md
@@ -1,5 +1,81 @@
 ## v.NEXT
 
+## v1.1, 2015-Mar-31
+
+### Windows Support
+
+* The Meteor command line tool now officially supports Windows 7, Windows 8.1,
+  Windows Server 2008, and Windows Server 2012. It can run from PowerShell or
+  Command Prompt.
+
+* There is a native Windows installer that will be available for download from
+  <https://www.meteor.com/install> starting with this release.
+
+* In this release, Meteor on Windows supports all features available on Linux
+  and Mac except building mobile apps with PhoneGap/Cordova.
+
+* The `meteor admin get-machine` command now supports an additional
+  architecture, `os.windows.x86_32`, which can be used to build binary packages
+  for Windows.
+
+### Version Solver
+
+* The code that selects compatible package versions for `meteor update`
+  and resolves conflicts on `meteor add` has been rewritten from the ground up.
+  The core solver algorithm is now based on MiniSat, an open-source SAT solver,
+  improving performance and maintainability.
+
+* Refresh the catalog instead of downgrading packages when the versions in
+  `.meteor/versions` aren't in the cache.  #3653
+
+* Don't downgrade packages listed in `.meteor/packages`, or upgrade to a new
+  major version, unless the new flag `--allow-incompatible-update` is passed
+  as an override.
+
+* Error messages are more detailed when constraints are unsatisfiable.
+
+* Prefer "patched" versions of new indirect dependencies, and take patches
+  to them on `meteor update` (for example, `1.0.1` or `1.0.0_1` over `1.0.0`).
+
+* Version Solver is instrumented for profiling (`METEOR_PROFILE=1` in the
+  environment).
+
+* Setting the `METEOR_PRINT_CONSTRAINT_SOLVER_INPUT` environment variable
+  prints information useful for diagnosing constraint solver bugs.
+
+### Tracker
+
+* Schedule the flush cycle using a better technique than `setTimeout` when
+  available.  #3889
+
+* Yield to the event loop during the flush cycle, unless we're executing a
+  synchronous `Tracker.flush()`.  #3901
+
+* Fix error reporting not being source-mapped properly. #3655
+
+* Introduce a new option for `Tracker.autorun` - `onError`. This callback can be
+  used to handle errors caught in the reactive computations. #3822
+
+### Blaze
+
+* Fix stack overflow from nested templates and helpers by avoiding recursion
+  during rendering.  #3028
+
+### `meteor` command-line tool
+
+* Don't fail if `npm` prints more than 200K.  #3887
+
+
+### Other bug fixes and improvements
+
+* Upgraded dependencies:
+
+  - uglify-js: 2.4.17 (from 2.4.13)
+
+Patches contributed by GitHub users hwillson, mitar, murillo128, Primigenus,
+rjakobsson, and tmeasday.
+
+
 ## v1.0.5, 2015-Mar-25
 
 * This version of Meteor now uses version 2.2 of the Facebook API for
@@ -25,7 +101,6 @@
 * Fix regression in 1.0.4 where `meteor publish-for-arch` only worked for
   packages without colons in their name.  #3951
 
-
 ## v1.0.4, 2015-Mar-17
 
 ### Mongo Driver

diff --git a/docs/.meteor/packages b/docs/.meteor/packages
@@ -7,7 +7,6 @@ standard-app-packages
 jquery
 underscore
 showdown
-jquery-waypoints
 spiderable
 appcache
 reload-safetybelt

diff --git a/docs/.meteor/release b/docs/.meteor/release
@@ -1 +1 @@
-METEOR@1.0.5
+METEOR@1.1
diff --git a/docs/.meteor/versions b/docs/.meteor/versions
@@ -1,13 +1,12 @@
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -18,20 +17,19 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]_2
-[email protected]
 [email protected]
 [email protected]
-[email protected].13
+[email protected].14
 [email protected]
 [email protected]
 [email protected]
-[email protected].5
+[email protected].6
 [email protected]
-[email protected].4
-[email protected].7
+[email protected].5
+[email protected].8
 [email protected]
 [email protected]
-[email protected].5
+[email protected].6
 [email protected]
 [email protected]
 [email protected]
@@ -45,11 +43,11 @@ [email protected]
 simple:[email protected]
 simple:[email protected]
 [email protected]
-[email protected].5
+[email protected].6
 [email protected]
 [email protected]
-[email protected].0
-[email protected].6
+[email protected].1
+[email protected].7
 [email protected]
 [email protected]
 [email protected]

diff --git a/docs/client/api-box.js b/docs/client/api-box.js
@@ -59,7 +59,7 @@ var typeNameTranslation = {
 
 Template.autoApiBox.helpers({
   apiData: apiData,
-  typeNames: function (nameList) {
+  typeNames: function typeNames (nameList) {
     // change names if necessary
     nameList = _.map(nameList, function (name) {
       // decode the "Array.<Type>" syntax
@@ -83,6 +83,10 @@ Template.autoApiBox.helpers({
         return typeNameTranslation[name];
       }
 
+      if (DocsData[name]) {
+        return typeNames(DocsData[name].type);
+      }
+
       return name;
     });
 

diff --git a/docs/client/common/quick-start.md b/docs/client/common/quick-start.md
@@ -1,16 +1,21 @@
 {{#template name="quickStart"}}
 ## Quick start!
 
-The following works on all [supported
-platforms](https://github.com/meteor/meteor/wiki/Supported-Platforms).
+Meteor supports [OS X, Windows, and Linux](https://github.com/meteor/meteor/wiki/Supported-Platforms).
 
-Install Meteor:
+On Windows?  [Download the official Meteor installer here](https://install.meteor.com/windows).
+
+On OS X or Linux?  Install the latest official Meteor release from your terminal:
 
 ```bash
-$ curl https://install.meteor.com | /bin/sh
+curl https://install.meteor.com/ | sh
 ```
 
-Create a project:
+The Windows installer supports Windows 7, Windows 8.1, Windows Server
+2008, and Windows Server 2012.  The command line installer supports Mac OS X
+10.7 (Lion) and above, and Linux on x86 and x86_64 architectures.
+
+Once you've installed Meteor, create a project:
 
 ```bash
 $ meteor create myapp
@@ -29,4 +34,4 @@ Unleash it on the world (on a free server we provide):
 ```bash
 $ meteor deploy myapp.meteor.com
 ```
-{{/template}}
+{{/template}}