Commit Graph

4171 Commits

Author SHA1 Message Date
Nick Martin
fc2ec5f637 Merge branch 'pr-1226' into devel 2013-07-23 22:50:32 -07:00
Zoltan Olah
732482b5ea Documentation for forceApprovalPrompt to meteor_loginwithexternalservice. 2013-07-23 22:50:07 -07:00
Zoltan Olah
951fc87213 Added support to force the approval prompt for the google oAuth flow. 2013-07-23 22:50:07 -07:00
Nick Martin
55e5e3b9c4 Merge branch 'pr-1181' into devel 2013-07-23 22:48:48 -07:00
Tim Haines
65c288bdb8 Handle Meteor.loginWithX called with callback but not options 2013-07-23 22:28:28 -07:00
Tim Haines
9251942b9a OAuth client: Only invoke the callback if it exists 2013-07-23 22:28:28 -07:00
Slava Kim
d65cf0307b Remove one letter option for --admin. 2013-07-23 17:58:44 -07:00
Slava Kim
095e81a0b6 Hide documentation to admin flag.
Shouldn't distract people who don't have Galaxy yet. (everyone outside MDG)
2013-07-23 12:35:57 -07:00
Slava Kim
f46d94cffd Option to deploy an app as 'admin app'.
So app binds to host.local/appName and is available in admin panel
2013-07-23 11:43:03 -07:00
Emily Stark
902d3b5f1c Don't try to add .meteor.com to an undefined sitename in galaxy configure. 2013-07-22 22:46:34 -07:00
Naomi Seyfer
2d2da146d9 Fix messages on timeout error 2013-07-22 18:24:31 -07:00
Naomi Seyfer
2d8b96c946 Fix timeout so that it gets cancelled when the connection is closed 2013-07-22 18:14:52 -07:00
David Glasser
d5ed4fd878 Don't try to read empty files.
Fixes #1237.
2013-07-22 16:58:44 -07:00
Naomi Seyfer
732847436b Time out if we dont connect to galaxy in 10s 2013-07-22 15:32:02 -07:00
Emily Stark
a27e6239b9 Validate certs on galaxy discovery requests. 2013-07-22 15:14:11 -07:00
Emily Stark
2e79a3145e Add .meteor.com to sitenames in meteor tool if no domain.
Commands that don't use galaxyCommand (logs and configure, for now) have to call
qualifySitename themselves, but I think this is okay for now because we're
mainly concerned with preventing deploys to non-fully-qualified domains.
2013-07-22 15:08:08 -07:00
David Glasser
96d5ce2fa4 Followup adding comment to d5a1295 fix. 2013-07-22 11:58:33 -07:00
Emily Stark
d5a1295977 Make galaxy discovery not follow redirects 2013-07-19 16:49:40 -07:00
Emily Stark
bd7e0d768c Merge branch 'master' into devel
Conflicts:
	History.md
	docs/.meteor/release
	packages/mongo-livedata/.npm/package/npm-shrinkwrap.json
	packages/mongo-livedata/package.js
2013-07-19 16:05:29 -07:00
Emily Stark
2e78d0d110 Merge branch 'release-0.6.4.1' 2013-07-19 15:58:36 -07:00
Emily Stark
614ab6a172 Update docs and examples to 0.6.4.1 2013-07-19 15:54:21 -07:00
Emily Stark
6d6a0977e2 Update banner and notices to 0.6.4.1 2013-07-19 15:32:57 -07:00
David Glasser
e8af79e151 Update docs and examples to rc3. 2013-07-19 12:09:01 -07:00
David Glasser
ab0e8e770e Use a commit of node-mongo-native with a unique package.json version.
Avoids confusing the npm cache.
release/0.6.4.1-rc3 release/0.6.4.1
2013-07-19 11:52:04 -07:00
David Glasser
237f6da87e Store runner.js in test-in-console as an asset; extract via env var.
Allow packages to specify that files are assets, overriding any handler defined
for them. (May be useful for web workers!)

Let Assets.getBinary work before global-imports.js is executed.
release/linker-pre6
2013-07-19 11:27:55 -07:00
David Glasser
d0b7b41860 Update shrinkwrap for mongodb update. 2013-07-19 11:26:22 -07:00
David Glasser
18168429d8 Add History entry for 0.6.4.1. release/0.6.4.1-rc2 2013-07-19 11:13:17 -07:00
David Glasser
abe145736d Update docs and examples to the RC. 2013-07-19 11:13:17 -07:00
David Glasser
d0ae0a86ea Commit mongo npm-shrinkwrap.json change. 2013-07-19 11:12:18 -07:00
David Glasser
7684c726c8 Use mongodb with extra null checks. 2013-07-19 11:12:18 -07:00
David Glasser
94810814d6 No longer use NPM progress module. 2013-07-19 10:42:56 -07:00
David Glasser
46180063c7 Update to mongodb 1.3.12. Includes Emily's patch. 2013-07-19 10:13:05 -07:00
David Glasser
15c396b686 linker: Add a few newlines before the exports section. 2013-07-19 10:08:10 -07:00
Geoff Schmidt
ee60b7bcae If you @export Foo.Bar.Baz, define Foo.Bar for you
(if it wasn't already defined by an import.)
2013-07-18 23:46:31 -07:00
David Glasser
9e6653d3ba Update docs to linker-pre5. 2013-07-18 18:08:12 -07:00
David Glasser
74da4b1adb Fix Meteor.release. release/linker-pre5 2013-07-18 12:40:16 -07:00
David Glasser
2f6a5b2193 "meteor rebuild-all" should not try to rebuild warehouse packages.
That's because warehouse packages are now pre-built and have no source tree.

(The existing code didn't work anyway. It iterated over self.releaseManifest
instead of self.releaseManifest.packages, and the "name" and "version" arguments
to the each were reversed. So it was trying to delete directories named ".build"
inside "/Users/glasser/.meteor/packages/de0d7206ad/tools" and
"/Users/glasser/.meteor/packages/packages". Since those directories never
existed, it didn't manage to try to rebuild any packages anyway.)
release/linker-pre4
2013-07-18 11:40:13 -07:00
David Glasser
99560c7d34 Bump bundle version. 2013-07-18 10:42:14 -07:00
David Glasser
c1667c7d0c Move clean-css and uglify-js from dev bundle to a new minifiers package.
This will make it much easier to upgrade them and test new versions.

(They are still called from the bundler, so changes to how we access them (eg
source map support) will require modifying tools, but just "upgrade to new
version" now is much easier.)
2013-07-18 10:31:52 -07:00
David Glasser
59bec95724 Add a comment about new Uglify version. 2013-07-18 10:17:49 -07:00
David Glasser
f29e4a37c9 Switch bootstrap tarballs to CNAME for CloudFront. 2013-07-18 08:06:27 -07:00
Nick Martin
fc307660ac Add a note about how isServer doesn't strip code from the client. 2013-07-17 19:57:40 -07:00
Emily Stark
7da0561995 Print error body if we get one from meteor mongo.
This got lost when we refactored to have the same interface as deploy-galaxy.
release/linker-pre3
2013-07-17 15:23:56 -07:00
David Glasser
ecf859e2a7 Don't advertise 'meteor galaxy' command until Galaxy support is official. 2013-07-17 14:10:26 -07:00
David Glasser
d16f906238 Bump dev bundle version. 2013-07-17 12:22:16 -07:00
David Glasser
88d12e76e6 Upgrade Underscore to 1.5.1.
A cursory glance at the diff suggests that this will not affect anything we do
in Meteor.
2013-07-17 12:21:38 -07:00
David Glasser
46871d3fa6 Update more NPM packages.
- clean-css: 0.8.3 - 1.0.11
 - progress: 0.0.5 - 1.0.0 (includes the bug fix we requested)

Don't try to install source-map twice, oops.
2013-07-17 12:10:25 -07:00
David Glasser
625aed5ea3 Upgrade fibers to 1.0.1. Specify the tested Node version in more places.
Dev bundle version not yet bumped.

Fixes #1153.
2013-07-17 11:48:10 -07:00
David Glasser
b7f6a093a4 dev bundle: use source-map version which took our PR.
Point to a slightly refactored version of source-map-support.

Have not yet bumped dev bundle version.
2013-07-17 11:43:23 -07:00
Emily Stark
4da6391ba5 Make galaxy configure command discover galaxy when a sitename is passed as an
argument.
2013-07-17 11:05:31 -07:00