Permalink
Browse files

merge

  • Loading branch information...
2 parents 7a498ba + de37574 commit 3dfe29d2867fa765508f20d44854910d4b1f2cf7 @sixolet sixolet committed Nov 14, 2013
Showing with 4,664 additions and 1,218 deletions.
  1. +35 −0 .mailmap
  2. +170 −7 History.md
  3. +45 −18 LICENSE.txt
  4. +2 −2 README.md
  5. +1 −1 docs/.meteor/release
  6. +62 −36 docs/client/api.html
  7. +84 −11 docs/client/api.js
  8. +2 −2 docs/client/concepts.html
  9. +4 −4 docs/client/docs.js
  10. +1 −0 docs/client/packages.html
  11. +165 −0 docs/client/packages/browser-policy.html
  12. +5 −7 docs/client/packages/random.html
  13. +5 −0 docs/lib/release-override.js
  14. +0 −1 examples/leaderboard/.meteor/packages
  15. +1 −1 examples/leaderboard/.meteor/release
  16. +1 −1 examples/parties/.meteor/release
  17. +10 −9 examples/parties/client/client.js
  18. +12 −2 examples/parties/model.js
  19. +1 −1 examples/todos/.meteor/release
  20. +0 −1 examples/wordplay/.meteor/packages
  21. +1 −1 examples/wordplay/.meteor/release
  22. +2 −3 examples/wordplay/client/wordplay.js
  23. +8 −5 examples/wordplay/model.js
  24. +3 −1 meteor
  25. +11 −6 packages/accounts-base/accounts_client.js
  26. +50 −26 packages/accounts-base/accounts_common.js
  27. +150 −41 packages/accounts-base/accounts_server.js
  28. +30 −0 packages/accounts-base/accounts_tests.js
  29. +1 −1 packages/accounts-password/package.js
  30. +30 −13 packages/accounts-password/password_server.js
  31. +272 −174 packages/accounts-password/password_tests.js
  32. +7 −2 packages/accounts-password/password_tests_setup.js
  33. +1 −1 packages/accounts-ui/package.js
  34. +1 −1 packages/appcache/package.js
  35. +1 −0 packages/browser-policy-common/.gitignore
  36. +27 −0 packages/browser-policy-common/browser-policy-common.js
  37. +10 −0 packages/browser-policy-common/package.js
  38. +1 −0 packages/browser-policy-content/.gitignore
  39. +238 −0 packages/browser-policy-content/browser-policy-content.js
  40. +9 −0 packages/browser-policy-content/package.js
  41. +1 −0 packages/browser-policy-framing/.gitignore
  42. +39 −0 packages/browser-policy-framing/browser-policy-framing.js
  43. +9 −0 packages/browser-policy-framing/package.js
  44. +1 −0 packages/browser-policy/.gitignore
  45. +129 −0 packages/browser-policy/browser-policy-test.js
  46. +13 −0 packages/browser-policy/package.js
  47. +4 −1 packages/ctl-helper/.npm/package/npm-shrinkwrap.json
  48. +3 −2 packages/ctl-helper/package.js
  49. +2 −1 packages/ctl/package.js
  50. +1 −1 packages/d3/package.js
  51. +50 −3 packages/ejson/ejson.js
  52. +104 −0 packages/ejson/ejson_test.js
  53. +1 −0 packages/ejson/package.js
  54. +118 −0 packages/ejson/stringify.js
  55. +2 −2 packages/email/.npm/package/npm-shrinkwrap.json
  56. +6 −3 packages/email/package.js
  57. +1 −0 packages/geojson-utils/.gitignore
  58. +380 −0 packages/geojson-utils/geojson-utils.js
  59. +102 −0 packages/geojson-utils/geojson-utils.tests.js
  60. +16 −0 packages/geojson-utils/package.js
  61. +4 −0 packages/geojson-utils/post.js
  62. +4 −0 packages/geojson-utils/pre.js
  63. +9 −0 packages/google/google_client.js
  64. +8 −3 packages/http/httpcall_tests.js
  65. +0 −39 packages/js-analyze-tests/js_analyze_tests.js
  66. +2 −1 packages/js-analyze-tests/package.js
  67. +6 −4 packages/js-analyze/.npm/package/npm-shrinkwrap.json
  68. +4 −183 packages/js-analyze/js_analyze.js
  69. +1 −4 packages/js-analyze/package.js
  70. +1 −1 packages/less/package.js
  71. +8 −3 packages/livedata/.npm/package/npm-shrinkwrap.json
  72. +24 −11 packages/livedata/livedata_server.js
  73. +2 −0 packages/livedata/livedata_tests.js
  74. +1 −2 packages/livedata/package.js
  75. +1 −1 packages/livedata/sockjs-0.3.4.js
  76. +4 −1 packages/livedata/stream_server.js
  77. +1 −1 packages/logging/.npm/package/npm-shrinkwrap.json
  78. +1 −1 packages/logging/package.js
  79. +1 −1 packages/madewith/package.js
  80. +8 −10 packages/minifiers/.npm/package/npm-shrinkwrap.json
  81. +3 −3 packages/minifiers/package.js
  82. +1 −1 packages/minimongo/NOTES
  83. +102 −24 packages/minimongo/minimongo.js
  84. +151 −13 packages/minimongo/minimongo_tests.js
  85. +83 −9 packages/minimongo/modify.js
  86. +3 −0 packages/minimongo/package.js
  87. +140 −43 packages/minimongo/selector.js
  88. +1 −1 packages/mongo-livedata/.npm/package/npm-shrinkwrap.json
  89. +12 −1 packages/mongo-livedata/allow_tests.js
  90. +97 −32 packages/mongo-livedata/collection.js
  91. +210 −33 packages/mongo-livedata/mongo_driver.js
  92. +660 −7 packages/mongo-livedata/mongo_livedata_tests.js
  93. +1 −1 packages/mongo-livedata/package.js
  94. +2 −2 packages/mongo-livedata/remote_collection_driver.js
  95. +28 −11 packages/oauth1/oauth1_binding.js
  96. +20 −10 packages/oauth1/oauth1_server.js
  97. +3 −1 packages/oauth1/oauth1_tests.js
  98. +88 −48 packages/random/random.js
  99. +14 −0 packages/random/random_tests.js
  100. +5 −0 packages/reload/reload.js
  101. +1 −1 packages/spark/spark_tests.js
  102. +1 −1 packages/spiderable/package.js
  103. +2 −1 packages/star-translate/package.js
  104. +1 −1 packages/stylus/package.js
  105. +1 −1 packages/test-helpers/seeded_random.js
  106. +89 −59 packages/underscore/underscore.js
  107. +40 −10 packages/webapp/.npm/package/npm-shrinkwrap.json
  108. +8 −3 packages/webapp/package.js
  109. +39 −10 packages/webapp/webapp_server.js
  110. +2 −3 scripts/admin/banner.txt
  111. +6 −5 scripts/admin/bless-release.js
  112. +6 −0 scripts/admin/notices.json
  113. +13 −11 scripts/admin/publish-release/server/publish-release.js
  114. +1 −1 scripts/cli-test.sh
  115. +19 −21 scripts/generate-dev-bundle.sh
  116. +1 −3 tools/app.html.in
  117. +2 −2 tools/bundler.js
  118. +4 −3 tools/deploy-galaxy.js
  119. +13 −12 tools/deploy.js
  120. +0 −53 tools/files.js
  121. +95 −0 tools/http-helpers.js
  122. +1 −1 tools/meteor.js
  123. +42 −4 tools/meteor_npm.js
  124. +13 −2 tools/mongo_runner.js
  125. +1 −1 tools/packages.js
  126. +49 −62 tools/run.js
  127. +1 −1 tools/server/boot.js
  128. +2 −1 tools/tests/test_bundler_assets.js
  129. +2 −2 tools/tests/test_bundler_npm.js
  130. +2 −1 tools/updater.js
  131. +5 −4 tools/warehouse.js
  132. +47 −40 tools/watch.js
View
@@ -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>
View
@@ -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
View
@@ -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>
@@ -192,13 +193,6 @@ 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
@@ -378,13 +376,6 @@ 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/
----------
View
@@ -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/`
View
@@ -1 +1 @@
-galaxy-appconfig-2
+galaxy-follower-5
Oops, something went wrong.

0 comments on commit 3dfe29d

Please sign in to comment.