merge

meteor · Nov 14, 2013 · 3dfe29d · 3dfe29d
2 parents 7a498ba + de37574
commit 3dfe29d
Show file tree

Hide file tree

Showing 132 changed files with 4,664 additions and 1,218 deletions.
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,35 @@
+# This makes it easier to find GitHub usernames for History.md.
+#
+# This controls 'git shortlog'. eg, run:
+#   git shortlog -s release/0.6.5.1..HEAD
+# to get a sorted list of all committers to revisions in HEAD but not
+# in 0.6.5.1.
+#
+# For any emails that show up in the shortlog that aren't in one of
+# these lists, figure out their GitHub username and add them.
+
+GITHUB: ansman <nicklas@ansman.se>
+GITHUB: awwx <andrew.wilcox@gmail.com>
+GITHUB: codeinthehole <david.winterbottom@gmail.com>
+GITHUB: jacott <geoffjacobsen@gmail.com>
+GITHUB: Maxhodges <Max@whiterabbitpress.com>
+GITHUB: meawoppl <meawoppl@gmail.com>
+GITHUB: mitar <mitar.git@tnode.com>
+GITHUB: mizzao <mizzao@gmail.com>
+GITHUB: mquandalle <maxime.quandalle@gmail.com>
+GITHUB: nathan-muir <ndmuir@gmail.com>
+GITHUB: RobertLowe <robert@iblargz.com>
+GITHUB: ryw <ry@rywalker.com>
+GITHUB: sdarnell <stephen@darnell.plus.com>
+GITHUB: timhaines <tmhaines@gmail.com>
+
+METEOR: avital <avital@thewe.net>
+METEOR: debergalis <matt@meteor.com>
+METEOR: dgreensp <dgreenspan@alum.mit.edu>
+METEOR: estark37 <emily@meteor.com>
+METEOR: estark37 <estark37@gmail.com>
+METEOR: glasser <glasser@meteor.com>
+METEOR: gschmidt <geoff@geoffschmidt.com>
+METEOR: n1mmy <nim@meteor.com>
+METEOR: sixolet <naomi@meteor.com>
+METEOR: Slava <slava@meteor.com>
diff --git a/History.md b/History.md
@@ -1,22 +1,185 @@
 ## vNEXT
 
-* Better error when passing a string to {{#each}}. #722
+* Fail explicitly when publishing non-cursors.
 
-* Write dates to Mongo as ISODate rather than Integer; existing data can be
-  converted by passing it through `new Date()`. #1228
+* Implement `$each`, `$sort`, and `$slice` options for minimongo's `$push`
+  modifier.
 
-* Login token deletion: Expire login tokens periodically. Add
-  Meteor._logoutAllOthers() for logging out other connections logged in as the
-  current user. Log out and close connections for deleted users and tokens.
+* Upgraded dependencies:
+  * SockJS server from 0.3.7 to 0.3.8
+
+
+## v0.6.6.1
+
+* Fix file watching on OSX. Work around Node issue #6251 by not using
+  fs.watch. #1483
+
+## v0.6.6
+
+
+#### Security
+
+* Add `browser-policy` package for configuring and sending
+  Content-Security-Policy and X-Frame-Options HTTP headers.
+  [See the docs](http://docs.meteor.com/#browserpolicy) for more.
+
+* Use cryptographically strong pseudorandom number generators when available.
+
+#### MongoDB
+
+* Add upsert support. `Collection.update` now supports the `{upsert:
+  true}` option. Additionally, add a `Collection.upsert` method which
+  returns the newly inserted object id if applicable.
+
+* `update` and `remove` now return the number of documents affected.  #1046
+
+* `$near` operator for `2d` and `2dsphere` indices.
+
+* The `fields` option to the collection methods `find` and `findOne` now works
+  on the client as well.  (Operators such as `$elemMatch` and `$` are not yet
+  supported in `fields` projections.) #1287
+
+* Pass an index and the cursor itself to the callbacks in `cursor.forEach` and
+  `cursor.map`, just like the corresponding `Array` methods.  #63
+
+* Support `c.find(query, {limit: N}).count()` on the client.  #654
+
+* Improve behavior of `$ne`, `$nin`, and `$not` selectors with objects containing
+  arrays.  #1451
+
+* Fix various bugs if you had two documents with the same _id field in
+  String and ObjectID form.
+
+#### Accounts
+
+* [Behavior Change] Expire login tokens periodically. Defaults to 90
+  days. Use `Accounts.config({loginExpirationInDays: null})` to disable
+  token expiration.
+
+* [Behavior Change] Write dates generated by Meteor Accounts to Mongo as
+  Date instead of number; existing data can be converted by passing it
+  through `new Date()`. #1228
+
+* Log out and close connections for users if they are deleted from the
+  database.
+
+* Add Meteor.logoutOtherClients() for logging out other connections
+  logged in as the current user.
+
+* `restrictCreationByEmailDomain` option in `Accounts.config` to restrict new
+  users to emails of specific domain (eg. only users with @meteor.com emails) or
+  a custom validator. #1332
+
+* Support OAuth1 services that require request token secrets as well as
+  authentication token secrets.  #1253
+
+* Warn if `Accounts.config` is only called on the client.  #828
+
+* Fix bug where callbacks to login functions could be called multiple
+  times when the client reconnects.
+
+#### DDP
+
+* Fix infinite loop if a client disconnects while a long yielding method is
+  running.
+
+* Unfinished code to support DDP session resumption has been removed. Meteor
+  servers now stop processing messages from clients and reclaim memory
+  associated with them as soon as they are disconnected instead of a few minutes
+  later.
+
+#### Tools
 
 * The pre-0.6.5 `Package.register_extension` API has been removed. Use
   `Package._transitional_registerBuildPlugin` instead, which was introduced in
   0.6.5. (A bug prevented the 0.6.5 reimplementation of `register_extension`
   from working properly anyway.)
 
+* Support using an HTTP proxy in the `meteor` command line tool. This
+  allows the `update`, `deploy`, `logs`, and `mongo` commands to work
+  behind a proxy. Use the standard `http_proxy` environment variable to
+  specify your proxy endpoint.  #429, #689, #1338
+
 * Build Linux binaries on an older Linux machine. Meteor now supports
   running on Linux machines with glibc 2.9 or newer (Ubuntu 10.04+, RHEL
-  and CentOS 6+, Fedora 10+, Debian 6+).
+  and CentOS 6+, Fedora 10+, Debian 6+). Improve error message when running
+  on Linux with unsupported glibc, and include Mongo stderr if it fails
+  to start.
+
+* Install NPM modules with `--force` to avoid corrupted local caches.
+
+* Rebuild NPM modules in packages when upgrading to a version of Meteor that
+  uses a different version of Node.
+
+* Disable the Mongo http interface. This lets you run meteor on two ports
+  differing by 1000 at the same time.
+
+#### Misc
+
+* [Known issue] Breaks support for pre-release OSX 10.9 'Mavericks'.
+  Will be addressed shortly. See issues:
+  https://github.com/joyent/node/issues/6251
+  https://github.com/joyent/node/issues/6296
+
+* `EJSON.stringify` now takes options:
+  - `canonical` causes objects keys to be stringified in sorted order
+  - `indent` allows formatting control over the EJSON stringification
+
+* EJSON now supports `Infinity`, `-Infinity` and `NaN`.
+
+* Check that the argument to `EJSON.parse` is a string.  #1401
+
+* Better error from functions that use `Meteor._wrapAsync` (eg collection write
+  methods and `HTTP` methods) and in DDP server message processing.  #1387
+
+* Support `appcache` on Chrome for iOS.
+
+* Support literate CoffeeScript files with the extension `.coffee.md` (in
+  addition to the already-supported `.litcoffee` extension). #1407
+
+* Make `madewith` package work again (broken in 0.6.5).  #1448
+
+* Better error when passing a string to `{{#each}}`. #722
+
+* Add support for JSESSIONID cookies for sticky sessions. Set the
+  `USE_JSESSIONID` environment variable to enable placing a JSESSIONID
+  cookie on sockjs requests.
+
+* Simplify the static analysis used to detect package-scope variables.
+
+* Upgraded dependencies:
+  * Node from 0.8.24 to 0.10.20
+  * MongoDB from 2.4.4 to 2.4.6
+  * MongoDB driver from 1.3.17 to 1.3.19
+  * http-proxy from 0.10.1 to a pre-release of 1.0.0
+  * stylus from 0.30.1 to 0.37.0
+  * nib from 0.8.2 to 1.0.0
+  * optimist from 0.3.5 to 0.6.0
+  * semver from 1.1.0 to 2.1.0
+  * request from 2.12.0 to 2.27.0
+  * keypress from 0.1.0 to 0.2.1
+  * underscore from 1.5.1 to 1.5.2
+  * fstream from 0.1.21 to 0.1.24
+  * tar from 0.1.14 to 0.1.18
+  * source-map from 0.1.26 to 0.1.30
+  * source-map-support from a fork of 0.1.8 to 0.2.3
+  * escope from a fork of 0.0.15 to 1.0.0
+  * estraverse from 1.1.2-1 to 1.3.1
+  * simplesmtp from 0.1.25 to 0.3.10
+  * stream-buffers from 0.2.3 to 0.2.5
+  * websocket from 1.0.7 to 1.0.8
+  * cli-color from 0.2.2 to 0.2.3
+  * clean-css from 1.0.11 to 1.1.2
+  * UglifyJS2 from a fork of 2.3.6 to a different fork of 2.4.0
+  * connect from 2.7.10 to 2.9.0
+  * send from 0.1.0 to 0.1.4
+  * useragent from 2.0.1 to 2.0.7
+  * replaced byline with eachline 2.3.3
+
+Patches contributed by GitHub users ansman, awwx, codeinthehole, jacott,
+Maxhodges, meawoppl, mitar, mizzao, mquandalle, nathan-muir, RobertLowe, ryw,
+sdarnell, and timhaines.
+
 
 ## v0.6.5.1
 

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -90,6 +90,7 @@ github-url-from-git: https://github.com/visionmedia/node-github-url-from-git
 pause: https://github.com/visionmedia/node-pause
 range-parser: https://github.com/visionmedia/node-range-parser
 send: https://github.com/visionmedia/send
+methods: https://github.com/visionmedia/node-methods
 ----------
 
 Copyright (c) 2010 TJ Holowaychuk <tj@vision-media.ca>
@@ -191,13 +192,6 @@ rbytes: https://github.com/akdubya/rbytes
 Copyright (c) 2010 Aleksander Williams
 
 
-----------
-formidable: https://github.com/felixge/node-formidable
-----------
-
-By Felix Geisendörfer and Tim Koschuetzki, Debuggable, Ltd.
-
-
 ----------
 colors: https://github.com/Marak/colors.js
 ----------
@@ -245,9 +239,11 @@ Copyright (c) 2012 Nathan Rajlich <nathan@tootallnate.net>
 
 ----------
 faye-websocket: https://github.com/faye/faye-websocket-node
+websocket-driver: https://github.com/faye/websocket-driver-node
 ----------
 
-Copyright (c) 2009-2012 James Coglan
+Copyright (c) 2009-2013 James Coglan
+Copyright (c) 2010-2013 James Coglan
 
 
 ----------
@@ -291,6 +287,7 @@ archy: https://github.com/substack/node-archy
 shell-quote: https://github.com/substack/node-shell-quote
 deep-equal: https://github.com/substack/node-deep-equal
 editor: https://github.com/substack/node-editor
+minimist: https://github.com/substack/node-minimist
 ----------
 
 Copyright 2010, 2011, 2012, 2013 James Halliday (mail@substack.net)
@@ -328,6 +325,7 @@ Felix Geisendörfer (felix@debuggable.com)
 
 ----------
 form-data: https://github.com/felixge/node-form-data
+multiparty: https://github.com/superjoe30/node-multiparty
 ----------
 
 Copyright (c) 2012 Felix Geisendörfer (felix@debuggable.com) and contributors
@@ -377,13 +375,6 @@ buffer-crc32: https://github.com/brianloveswords/buffer-crc32
 Copyright (c) 2013 Brian J. Brennan
 
 
-----------
-byline: https://github.com/jahewson/node-byline
-----------
-
-node-byline (C) 2011-2013 John Hewson
-
-
 ----------
 child-process-close: https://github.com/piscisaureus/child-process-close
 ----------
@@ -475,6 +466,8 @@ Copyright (c) 2011 SDA Software Associates Inc.
 
 ----------
 sha: https://github.com/ForbesLindesay/sha
+type-of: https://github.com/ForbesLindesay/type-of
+uglify-to-browserify: https://github.com/ForbesLindesay/uglify-to-browserify
 ----------
 
 Copyright (c) 2013 Forbes Lindesay
@@ -516,6 +509,38 @@ Copyright 2011, Robert Mustacchi. All rights reserved.
 Copyright 2011, Joyent, Inc. All rights reserved.
 
 
+----------
+eachline: https://github.com/williamwicks/node-eachline
+----------
+
+Copyright (c) 2013 William Wicks
+
+
+----------
+eventemitter2: https://github.com/hij1nx/EventEmitter2
+----------
+
+Copyright (c) 2011 hij1nx http://www.twitter.com/hij1nx
+
+
+----------
+stream-counter: https://github.com/superjoe30/node-stream-counter
+----------
+
+Copyright (c) 2013 Andrew Kelley
+
+----------
+uid2: https://github.com/coreh/uid2
+----------
+
+Copyright (c) 2013 Marco Aurelio
+
+----------
+geojson-utils: https://github.com/maxogden/geojson-js-utils
+----------
+
+Copyright (c) 2010 Max Ogden
+
 ==============
 Apache License
 ==============
@@ -531,7 +556,8 @@ Unless required by applicable law or agreed to in writing, software distributed
 """
 
 ----------
-mongo-drivers: https://github.com/mongodb/node-mongodb-native
+mongodb: (Node driver) https://github.com/mongodb/node-mongodb-native
+kerberos: https://github.com/christkv/kerberos
 ----------
 
 Copyright 2009 - 2010 Christian Amor Kvalheim.
@@ -1309,7 +1335,7 @@ Other
 =====
 
 ----------
-mimelib: https://github.com/andris9/mimelib
+mimelib-noiconv: https://github.com/andris9/mimelib
 mailcomposer: https://github.com/andris9/mailcomposer
 simplesmtp: https://github.com/andris9/simplesmtp
 rai: https://github.com/andris9/rai
@@ -1407,7 +1433,7 @@ For more information, please refer to <http://unlicense.org/>
 
 
 ----------
-mongodb: http://www.mongodb.org/
+MongoDB: http://www.mongodb.org/
 ----------
 
 LICENSE
@@ -1711,6 +1737,7 @@ The externally maintained libraries used by libuv are:
 
 ----------
 nodejs: http://nodejs.org/
+readable-stream: https://github.com/isaacs/readable-stream/
 ----------
 
 

diff --git a/README.md b/README.md
@@ -56,8 +56,8 @@ From your checkout, you can read the docs locally. The `/docs` directory is a
 meteor application, so simply change into the `/docs` directory and launch
 the app:
 
-	cd docs/
-	meteor
+    cd docs/
+    ../meteor
 
 You'll then be able to read the docs locally in your browser at
 `http://localhost:3000/`

diff --git a/docs/.meteor/release b/docs/.meteor/release
@@ -1 +1 @@
-galaxy-appconfig-2
+galaxy-follower-5