Emily Stark cb54ae18fb Merge branch 'master' into devel ...

Conflicts:
	History.md
	examples/localmarket/.meteor/release
	examples/localmarket/.meteor/versions
	packages/stylus/README.md
	tools/compiler.js
	tools/package-client.js
	tools/tests/old/app-with-private/.meteor/versions
	tools/tests/old/app-with-public/.meteor/versions
	tools/tests/old/empty-app/.meteor/versions

2014-10-28 10:42:30 -07:00

..

client

Poll for plugins to be ready in meteor_cordova_loader

2014-10-15 18:54:56 -07:00

cordova-assets

New default icons and launchscreens for mobile apps

2014-10-23 16:12:42 -07:00

cordova-scripts

Pass --progress-bar to curl in ensure_android_bundle

2014-10-09 10:24:11 -07:00

server

Catch shell socket server errors so they don't break self-test.

2014-10-21 17:49:16 -04:00

skel

Small fixes

2014-09-30 19:25:35 -07:00

skel-pack

Update package skel to include package name and omit "METEOR@"

2014-10-02 17:24:22 -07:00

test-runner-app/.meteor

Don't record package usage when running meteor test-packages

2014-06-16 14:02:47 -07:00

tests

Merge branch 'master' into devel

2014-10-28 10:42:30 -07:00

archinfo.js

refactor dependencies schema again

2014-03-05 23:33:06 -08:00

auth-client.js

use stderr for auth-client errors

2014-10-17 11:01:32 -07:00

auth.js

Revert "Don't automatically put ?close at the end of Meteor Developer Accounts URLs"

2014-10-11 00:17:22 -07:00

builder.js

Further simplify NpmDiscards to perform no additional disk I/O.

2014-10-21 13:01:31 -07:00

buildmessage.js

Tweak when tasks are marked as done & current, also nudge the spinner when no progress

2014-10-17 11:27:17 -07:00

bundler.js

Revert "Don't rewrite relative paths for cordova builds."

2014-10-24 12:31:58 -07:00

catalog-bootstrap-checkout.js

refresh-related cleanup

2014-10-17 13:47:21 -07:00

catalog-bootstrap-prebuilt.js

finish the sql merge: rename unipack to isopack where needed

2014-09-30 16:36:33 -07:00

catalog-local.js

refresh-related cleanup

2014-10-17 13:47:21 -07:00

catalog-remote.js

change the function call to contentQuery

2014-10-23 13:35:46 -07:00

catalog.js

replace 'figuring out the best package versions to use' with 'selecting package versions'

2014-10-23 17:24:05 -07:00

cleanup.js

Backport some comment-punctuation changes

2014-01-30 21:08:56 -05:00

commands-cordova.js

Tweak cordova oauth warning wording

2014-10-27 19:32:09 -07:00

commands-packages.js

get rid of help code telling user to specify release

2014-10-28 00:56:06 -07:00

commands.js

fix meteor create --example with packages

2014-10-28 00:58:06 -07:00

compiler.js

Let build plugins override the 'bare' option for JavaScript files

2014-10-22 10:25:40 -07:00

config.js

use the right build server and minor stuff

2014-10-16 17:10:45 -07:00

console.js

Add XXX comment

2014-10-28 10:03:29 -07:00

deploy-galaxy.js

Only require a ctl program when deploying to Galaxy.

2014-10-14 18:32:59 -04:00

deploy.js

Use spinner for upload

2014-10-27 17:03:22 -07:00

fiber-helpers.js

Make buildmessage fiber-aware

2014-08-04 19:03:05 -07:00

files.js

Merge branch 'android_faster' into devel

2014-10-02 21:09:53 -07:00

help.txt

Update help text for --mobile-server to reflect reality

2014-10-23 16:14:05 -07:00

http-helpers.js

Console.debug the HTTP requests

2014-10-27 09:25:19 -07:00

inspector.js

Implement a meteor debug command.

2014-09-29 22:50:49 -04:00

isopack.js

Implement Npm.strip, for use in package.js.

2014-10-17 18:24:31 -04:00

linker.js

update linker.js

2014-06-17 17:33:55 -07:00

main.js

fix meteor create --example with packages

2014-10-28 00:58:06 -07:00

meteor-npm.js

strip out extra dependencies on semver in tool

2014-09-10 15:53:23 -07:00

mongo-exit-codes.js

standardize on '-' rather than '_' in filenames

2013-12-30 18:41:35 -08:00

node_modules

Use symlink instead of $NODE_PATH

2014-06-13 17:14:42 -07:00

npm-discards.js

Further simplify NpmDiscards to perform no additional disk I/O.

2014-10-21 13:01:31 -07:00

package-cache.js

Merge branch 'isopack' into release-0.9.4

2014-09-29 20:08:02 -07:00

package-client.js

Fix up HTTP upload to use body & response sizes from options

2014-10-27 09:25:19 -07:00

package-loader.js

debug-only flag only affects bundler, not compiler

2014-10-07 18:26:21 -07:00

package-source.js

Exit 'meteor run' when cordova plugins or platforms change.

2014-10-22 10:40:33 -07:00

package-version-parser.js

Allow any number of spaces by || in constraints

2014-10-09 21:20:14 -07:00

parse-stack.js

parse-stack: don't choke on files with colons

2014-09-12 12:31:36 -07:00

processes.js

Log changed env vars for commands we run

2014-10-15 14:22:44 -07:00

profile-require.js

Make 'meteor --help' startup >3x faster, with the help of a require() tree profiler. The speedup is entirely due to lazy-loading third party modules.

2013-05-13 11:56:51 -07:00

progress.js

Fix “Uploading” progress bar on meteor deploy

2014-10-23 16:12:54 -07:00

project.js

Don't break everything

2014-10-24 14:13:21 -07:00

release.js

"Normalize" most calls to getMeteorReleaseVersion

2014-10-24 14:13:16 -07:00

run-all.js

another instance of printing METEOR

2014-10-23 16:15:45 -07:00

run-app.js

"Normalize" most calls to getMeteorReleaseVersion

2014-10-24 14:13:16 -07:00

run-httpproxy.js

Increase the pool of fd's for httpproxy

2014-10-15 18:55:17 -07:00

run-log.js

Make 'meteor run' pretty

2014-09-24 15:53:05 -07:00

run-mongo.js

Rename mongo-livedata to mongo

2014-08-28 11:14:40 -07:00

run-proxy.js

Better error message for -p bogus:1234

2014-04-18 14:39:31 -07:00

run-selenium.js

Initial support for selenium in test-packages

2014-09-11 10:11:15 -07:00

run-updater.js

Bump catalog update timer from 15min to 3hr.

2014-10-22 10:53:39 -07:00

run-velocity.js

code style cleanups to match style guide.

2014-09-29 19:50:24 -07:00

selftest.js

Bump self-test timeout for (fake) mongo start

2014-10-17 13:52:06 -07:00

service-connection.js

Make more DDP errors specific

2014-10-21 12:52:24 -07:00

stats.js

Use Console.stderr for package stats errors

2014-10-21 14:14:16 -07:00

test-utils.js

Format deploy console messages to include protocol

2014-10-13 17:36:40 -07:00

tropohouse.js

We shouldn't be capturing the download output; enterJob instead

2014-10-27 17:02:39 -07:00

uniload.js

Put 'netroute' into dev bundle

2014-10-14 21:14:14 -07:00

updater.js

Add comment about why we don't just delay the first update cycle

2014-10-17 13:47:22 -07:00

upgraders.js

Notice for 0.9.1 now looks like the one for 0.9.0

2014-10-21 12:41:18 -07:00

utils.js

fix checkout message if app release lacks METEOR@

2014-10-23 10:51:20 -07:00

warehouse.js

Make meteor search output prettier

2014-10-17 06:26:47 -07:00

watch.js

Revert accidental watch change from 78497c0

2014-09-10 17:43:02 -07:00