Merge branch 'release-1.2.0.2'

meteor · Sep 29, 2015 · a2afa9c · a2afa9c
2 parents 7a5db47 + d087bdf
commit a2afa9c
Show file tree

Hide file tree

Showing 72 changed files with 1,097 additions and 320 deletions.
diff --git a/History.md b/History.md
@@ -1,6 +1,20 @@
 ## v.NEXT
 
-## in progress: v1.2
+* Update Crosswalk plugin for Cordova to 1.3.1. [#5267](https://github.com/meteor/meteor/issues/5267)
+
+* Fix `meteor add` for a Cordova plugin using a Git URL with SHA.
+
+* Upgraded the `promise` package to use `meteor-promise@0.5.0`, which uses
+  the global `Promise` constructor in browsers that define it natively.
+
+* Fix error in assigning attributes to `<body>` tag when using Blaze templates
+  or `static-html`. [#5232](https://github.com/meteor/meteor/issues/5232)
+
+## v1.2.0.1, 2015-Sept-22
+
+* Fix internal exception caused by missing exports. #5228
+
+## v1.2, 2015-Sept-21
 
 There are quite a lot of changes in Meteor 1.2. See the
 [Wiki](https://github.com/meteor/meteor/wiki/Breaking-changes-in-Meteor-1.2) for
@@ -348,8 +362,7 @@ a shorter list of breaking changes you should be aware of when upgrading.
 
 ### Windows
 
-* Increase the buffer size for `netstat` when looking for running Mongo servers.
-  #4125
+* Increase the buffer size for `netstat` when looking for running Mongo servers. #4125
 
 * The Windows installer now always fetches the latest available version of
   Meteor at runtime, so that it doesn't need to be recompiled for every release.

diff --git a/circle.yml b/circle.yml
@@ -0,0 +1,8 @@
+dependencies:
+  override:
+    - ./meteor --get-ready
+
+test:
+  override:
+    - ./scripts/ci.sh :
+        parallel: true
diff --git a/docs/.meteor/release b/docs/.meteor/release
@@ -1 +1 @@
-METEOR@1.2.0.1
+METEOR@1.2.0.2
diff --git a/docs/.meteor/versions b/docs/.meteor/versions
@@ -9,7 +9,7 @@ blaze-html-templates@1.0.1
 blaze-tools@1.0.4
 boilerplate-generator@1.0.4
 caching-compiler@1.0.0
-caching-html-compiler@1.0.1
+caching-html-compiler@1.0.2
 callback-hook@1.0.4
 check@1.0.6
 ddp@1.2.2
@@ -18,7 +18,7 @@ ddp-common@1.2.1
 ddp-server@1.2.1
 deps@1.0.9
 diff-sequence@1.0.1
-ecmascript@0.1.4
+ecmascript@0.1.5
 ecmascript-collections@0.1.6
 ejson@1.0.7
 fastclick@1.0.7
@@ -30,24 +30,24 @@ http@1.1.1
 id-map@1.0.4
 jquery@1.11.4
 launch-screen@1.0.4
-less@2.5.0_2
+less@2.5.0_3
 livedata@1.0.15
 logging@1.0.8
 markdown@1.0.5
-meteor@1.1.7
+meteor@1.1.9
 meteor-base@1.0.1
 minifiers@1.1.7
-minimongo@1.0.9
+minimongo@1.0.10
 mobile-experience@1.0.1
 mobile-status-bar@1.0.6
-mongo@1.1.1
+mongo@1.1.2
 mongo-id@1.0.1
 npm-mongo@1.4.39_1
 observe-sequence@1.0.7
 ordered-dict@1.0.4
-promise@0.4.8
+promise@0.5.0
 random@1.0.4
-reactive-dict@1.1.1
+reactive-dict@1.1.2
 reactive-var@1.0.6
 reload@1.1.4
 reload-safetybelt@1.0.5
@@ -60,10 +60,10 @@ simple:markdown-templating@1.2.7
 spacebars@1.0.7
 spacebars-compiler@1.0.7
 spiderable@1.0.9
-standard-minifiers@1.0.0
-templating@1.1.3
+standard-minifiers@1.0.1
+templating@1.1.4
 templating-tools@1.0.0
-tracker@1.0.8
+tracker@1.0.9
 ui@1.0.8
 underscore@1.0.4
 url@1.0.5

diff --git a/docs/client/helpers.js b/docs/client/helpers.js
@@ -1,4 +1,4 @@
-release = Meteor.release ? "1.2.0.1" : "(checkout)";
+release = Meteor.release ? "1.2.0.2" : "(checkout)";
 
 Template.registerHelper("release", release);
 

diff --git a/examples/clock/.meteor/release b/examples/clock/.meteor/release
@@ -1 +1 @@
-METEOR@1.2.0.1
+METEOR@1.2.0.2
diff --git a/examples/clock/.meteor/versions b/examples/clock/.meteor/versions
@@ -8,7 +8,7 @@ blaze-html-templates@1.0.1
 blaze-tools@1.0.4
 boilerplate-generator@1.0.4
 caching-compiler@1.0.0
-caching-html-compiler@1.0.1
+caching-html-compiler@1.0.2
 callback-hook@1.0.4
 check@1.0.6
 ddp@1.2.2
@@ -17,7 +17,7 @@ ddp-common@1.2.1
 ddp-server@1.2.1
 deps@1.0.9
 diff-sequence@1.0.1
-ecmascript@0.1.4
+ecmascript@0.1.5
 ecmascript-collections@0.1.6
 ejson@1.0.7
 geojson-utils@1.0.4
@@ -29,29 +29,29 @@ id-map@1.0.4
 jquery@1.11.4
 livedata@1.0.15
 logging@1.0.8
-meteor@1.1.7
+meteor@1.1.9
 meteor-base@1.0.1
 minifiers@1.1.7
-minimongo@1.0.9
-mongo@1.1.1
+minimongo@1.0.10
+mongo@1.1.2
 mongo-id@1.0.1
 npm-mongo@1.4.39_1
 observe-sequence@1.0.7
 ordered-dict@1.0.4
-promise@0.4.8
+promise@0.5.0
 random@1.0.4
-reactive-dict@1.1.1
+reactive-dict@1.1.2
 reactive-var@1.0.6
 reload@1.1.4
 retry@1.0.4
 routepolicy@1.0.6
 session@1.1.1
 spacebars@1.0.7
 spacebars-compiler@1.0.7
-standard-minifiers@1.0.0
-templating@1.1.3
+standard-minifiers@1.0.1
+templating@1.1.4
 templating-tools@1.0.0
-tracker@1.0.8
+tracker@1.0.9
 ui@1.0.8
 underscore@1.0.4
 url@1.0.5

diff --git a/examples/leaderboard/.meteor/release b/examples/leaderboard/.meteor/release
@@ -1 +1 @@
-METEOR@1.2.0.1
+METEOR@1.2.0.2
diff --git a/examples/leaderboard/.meteor/versions b/examples/leaderboard/.meteor/versions
@@ -9,7 +9,7 @@ blaze-html-templates@1.0.1
 blaze-tools@1.0.4
 boilerplate-generator@1.0.4
 caching-compiler@1.0.0
-caching-html-compiler@1.0.1
+caching-html-compiler@1.0.2
 callback-hook@1.0.4
 check@1.0.6
 ddp@1.2.2
@@ -18,7 +18,7 @@ ddp-common@1.2.1
 ddp-server@1.2.1
 deps@1.0.9
 diff-sequence@1.0.1
-ecmascript@0.1.4
+ecmascript@0.1.5
 ecmascript-collections@0.1.6
 ejson@1.0.7
 geojson-utils@1.0.4
@@ -31,29 +31,29 @@ insecure@1.0.4
 jquery@1.11.4
 livedata@1.0.15
 logging@1.0.8
-meteor@1.1.7
+meteor@1.1.9
 meteor-base@1.0.1
 minifiers@1.1.7
-minimongo@1.0.9
-mongo@1.1.1
+minimongo@1.0.10
+mongo@1.1.2
 mongo-id@1.0.1
 npm-mongo@1.4.39_1
 observe-sequence@1.0.7
 ordered-dict@1.0.4
-promise@0.4.8
+promise@0.5.0
 random@1.0.4
-reactive-dict@1.1.1
+reactive-dict@1.1.2
 reactive-var@1.0.6
 reload@1.1.4
 retry@1.0.4
 routepolicy@1.0.6
 session@1.1.1
 spacebars@1.0.7
 spacebars-compiler@1.0.7
-standard-minifiers@1.0.0
-templating@1.1.3
+standard-minifiers@1.0.1
+templating@1.1.4
 templating-tools@1.0.0
-tracker@1.0.8
+tracker@1.0.9
 ui@1.0.8
 underscore@1.0.4
 url@1.0.5

diff --git a/examples/localmarket/.meteor/release b/examples/localmarket/.meteor/release
@@ -1 +1 @@
-METEOR@1.2.0.1
+METEOR@1.2.0.2
diff --git a/examples/localmarket/.meteor/versions b/examples/localmarket/.meteor/versions
@@ -11,18 +11,18 @@ blaze-html-templates@1.0.1
 blaze-tools@1.0.4
 boilerplate-generator@1.0.4
 caching-compiler@1.0.0
-caching-html-compiler@1.0.1
+caching-html-compiler@1.0.2
 callback-hook@1.0.4
 check@1.0.6
-coffeescript@1.0.9
+coffeescript@1.0.10
 ddp@1.2.2
 ddp-client@1.2.1
 ddp-common@1.2.1
 ddp-rate-limiter@1.0.0
 ddp-server@1.2.1
 deps@1.0.9
 diff-sequence@1.0.1
-ecmascript@0.1.4
+ecmascript@0.1.5
 ecmascript-collections@0.1.6
 ejson@1.0.7
 email@1.0.7
@@ -40,19 +40,19 @@ iron:router@0.9.4
 jquery@1.11.4
 jquery-waypoints@1.0.4
 launch-screen@1.0.4
-less@2.5.0_2
+less@2.5.0_3
 livedata@1.0.15
 localstorage@1.0.5
 logging@1.0.8
 mdg:camera@1.2.0
 mdg:geolocation@1.1.0
-meteor@1.1.7
+meteor@1.1.9
 meteor-base@1.0.1
 minifiers@1.1.7
-minimongo@1.0.9
+minimongo@1.0.10
 mobile-experience@1.0.1
 mobile-status-bar@1.0.6
-mongo@1.1.1
+mongo@1.1.2
 mongo-id@1.0.1
 npm-mongo@1.4.39_1
 oauth@1.1.6
@@ -61,10 +61,10 @@ observe-sequence@1.0.7
 ordered-dict@1.0.4
 percolate:velocityjs@1.2.1_1
 percolate:wireframing@0.2.0
-promise@0.4.8
+promise@0.5.0
 random@1.0.4
 rate-limit@1.0.0
-reactive-dict@1.1.1
+reactive-dict@1.1.2
 reactive-var@1.0.6
 reload@1.1.4
 retry@1.0.4
@@ -73,11 +73,11 @@ service-configuration@1.0.5
 session@1.1.1
 spacebars@1.0.7
 spacebars-compiler@1.0.7
-standard-minifiers@1.0.0
-templating@1.1.3
+standard-minifiers@1.0.1
+templating@1.1.4
 templating-tools@1.0.0
 tmeasday:publish-counts@0.7.2
-tracker@1.0.8
+tracker@1.0.9
 twitter@1.1.5
 ui@1.0.8
 underscore@1.0.4

diff --git a/examples/simple-todos-angular/.meteor/release b/examples/simple-todos-angular/.meteor/release
@@ -1 +1 @@
-METEOR@1.2
+METEOR@1.2.0.2