Commit Graph

5372 Commits

Author SHA1 Message Date
Geoff Schmidt
b9f63839e6 Merge branch 'devel' into sso release/sso-1 2013-12-19 17:17:01 -08:00
David Glasser
0cf747101f Merge branch 'pr-1669' into devel
Fixes #1668.
2013-12-19 17:02:48 -08:00
David Glasser
f65b1cd2ae Remove backwards-compatibility code
There's no need to be backwards-compatible here with something that has
never worked (or at least hasn't worked since 0.6.5).
2013-12-19 17:00:58 -08:00
David Glasser
6844cb2615 Add test for #1668 2013-12-19 17:00:38 -08:00
Mitar
a21f0d2e58 Pass "bare" option when using CoffeeScript as well. 2013-12-19 16:54:03 -08:00
Nick Martin
0db5b9393a update readme to note build requirements. 2013-12-19 15:46:44 -08:00
Geoff Schmidt
943600df9b Fix bug where preflighted password RPCs on old-style apps wouldn't work 2013-12-19 15:42:33 -08:00
Nick Martin
eeae8ad11e Reword docs around file load order to be more correct. Fixes #1675. 2013-12-19 15:14:16 -08:00
David Glasser
39e3f1ee1a In "dev mode" email, be more explicit.
Make it clear that nothing is being sent and point users to MAIL_URL.

Fixes #1196.
2013-12-19 15:07:39 -08:00
Naomi Seyfer
2b36c8be33 Count new servers already started in ctl before starting lots more 2013-12-19 13:33:18 -08:00
Naomi Seyfer
27c364a21a Count new servers already started in ctl before starting lots more release/galaxy-sso-6 2013-12-19 13:32:19 -08:00
Geoff Schmidt
81f8659d21 update login tokens before rerunning publish functions release/galaxy-sso-5 2013-12-18 18:33:19 -08:00
Emily Stark
48521f9d18 Use only websockets transports for sockjs when behind a DDP proxy 2013-12-18 16:41:32 -08:00
Geoff Schmidt
a314eb7d62 Switch from cookies to headers for Meteor auth 2013-12-18 15:36:04 -08:00
Emily Stark
3003f46347 Use special bind path for panel release/galaxy-sso-4 2013-12-17 22:23:24 -08:00
David Glasser
0f4a21f89f meteor_npm: don't lose interesting resolved
If an indirect dependency resolves to something other than a semver (or
a GitHub tarball), it will be stored in the 'resolved'. Our shrinkwrap
minifier (which helps to reduce spurious shrinkwrap file changes) needs
to recognize that.

Also, consistently use the "version" field in the minified shrinkwrap
file (which a comment already claimed we could do).

Fixes #1684.
2013-12-17 19:05:25 -08:00
David Glasser
ebb729f0f6 Fix crash with an empty programs/foo dir
We should never use the existence of a directory in our source tree to
make a decision, because git doesn't track directory existence, and it's
easy to end up with extraneous directories (containing gitignored files,
eg).  So we should ignore programs/foo directories in apps if they don't
contain package.js.
2013-12-17 18:35:31 -08:00
icellan
fa25bcafb4 Removed extra comma at end of method. Fixes IE7 2013-12-17 17:00:48 -08:00
Naomi Seyfer
f0f7ae2d16 Do not loop forever on ie8 release/galaxy-zdt-4 2013-12-17 12:12:20 -08:00
David Glasser
b684ca9554 Merge branch 'master' into devel
Conflicts:
	History.md
2013-12-17 11:11:16 -08:00
David Glasser
fc432d1465 Merge release 0.7.0. 2013-12-17 11:09:42 -08:00
David Glasser
b6c7d424bc Update examples and docs to 0.7.0 2013-12-17 11:08:19 -08:00
David Glasser
dbdab6a156 Formatting improvements to History 2013-12-17 11:00:07 -08:00
Nick Martin
8bd400e560 lets do 0.7.0 instead 2013-12-17 10:54:33 -08:00
David Glasser
4771b71734 Rename 0.6.7 to 0.7.0 2013-12-17 10:48:54 -08:00
Nick Martin
9cb6df57fb Link to wiki page in History. 2013-12-17 01:51:49 -08:00
Nick Martin
a0734bfe58 strawman banner.txt and notices. 2013-12-17 01:43:20 -08:00
Emily Stark
373bc2ceec Allow overwriting ~/.meteorsession file with env var.
Useful for tests.
2013-12-16 22:03:50 -08:00
David Glasser
46fb7b6d21 LICENSE update (script follows!)
find . -name 'node_modules' | grep -v .meteor | xargs ls | cat | grep -ve '^\.' | sort | uniq > bar
for i in `cat bar` ; do
  echo -n "$i "
  grep -e "^$i:" LICENSE.txt || echo "NOT FOUND"
done
2013-12-16 20:40:34 -08:00
David Glasser
2859e30e60 A few more History.md things 2013-12-16 20:25:48 -08:00
David Glasser
e042e5a85a Fix "drop collection" test failure
There was a race condition in the manipulation of the write fence by the
drop collection code. Specifically, when seeing a "drop collection"
oplog entry, OplogObserveDriver took no immediate action and instead
deferred some "should I re-poll now or later?" logic.

This allowed the write fence's oplogHandle.waitUntilCaughtUp code to
think that everything was "caught up" even though the effects of the
"drop collection" entry had not yet affected the cursor's state (by
transitioning it away from the STEADY state).  The fix is to ensure that
the state-change aspects of processing the entry occur immediately; the
actual re-query is still deferred in order to not block the oplog tailer
from continuing.

Reported by: @awwx

(The previous failure can made consistently reproducible by replacing the
`Meteor.defer` that is removed by this commit with a
`Meteor.setTimeout(,200)`.)
release/0.7.0 release/0.6.7-rc3
2013-12-16 17:42:51 -08:00
David Glasser
cce9d36dfa Add some XXX comments about when we should re-poll 2013-12-16 17:42:49 -08:00
Emily Stark
546c344b3d Merge branch 'devel' into sso
Conflicts:
	packages/ctl-helper/ctl-helper.js
	packages/webapp/webapp_server.js
release/galaxy-sso-3
2013-12-16 17:30:43 -08:00
Geoff Schmidt
c1f9b423c5 Correctly handle exceptions in http-helpers 2013-12-16 16:16:53 -08:00
David Glasser
e6c87236a6 Fix "drop collection" test failure
There was a race condition in the manipulation of the write fence by the
drop collection code. Specifically, when seeing a "drop collection"
oplog entry, OplogObserveDriver took no immediate action and instead
deferred some "should I re-poll now or later?" logic.

This allowed the write fence's oplogHandle.waitUntilCaughtUp code to
think that everything was "caught up" even though the effects of the
"drop collection" entry had not yet affected the cursor's state (by
transitioning it away from the STEADY state).  The fix is to ensure that
the state-change aspects of processing the entry occur immediately; the
actual re-query is still deferred in order to not block the oplog tailer
from continuing.

Reported by: @awwx

(The previous failure can made consistently reproducible by replacing the
`Meteor.defer` that is removed by this commit with a
`Meteor.setTimeout(,200)`.)
2013-12-16 15:14:43 -08:00
Emily Stark
63c7aecbda Remove stray space on galaxy login release/galaxy-sso-2 2013-12-16 14:32:33 -08:00
Naomi Seyfer
37c63ffae7 Package instead of Meteor to measure js loading; allow use of webapp a la carte
Also change the timing to allow more time for new servers to come up.
release/galaxy-zdt-2
2013-12-16 12:14:01 -08:00
Emily Stark
9780c5b8af Allows apps to set ROOT_URL with Ctl.rootUrl 2013-12-15 20:22:10 -08:00
Nick Martin
a6c8b5eef3 Give up on documenting facts current api. release/0.6.7-rc2 2013-12-15 19:40:57 -08:00
Nick Martin
9dfa0ee95f Update tools tests for Webapp bundled asset change 6eccf8c 2013-12-15 17:17:41 -08:00
David Glasser
2991ac9312 fix missing expect() call in password-tests
add a console.trace that helps debug it
2013-12-15 17:17:33 -08:00
David Glasser
2f745bb52f Test changing Date and ObjectID 2013-12-15 17:17:25 -08:00
Nick Martin
20e8e4241c Retry subscription on error. 2013-12-15 17:17:17 -08:00
Nick Martin
8b37c0084d Make facts automatically subscribe when you show the template.
Also, namespace the collection and subscription name.
2013-12-15 17:17:09 -08:00
David Glasser
fd215633cc Make observe driver facts names consistent 2013-12-15 17:16:59 -08:00
Emily Stark
4aa5eb181a Interpret sockjs /info base_url relative to original base_url 2013-12-14 19:42:20 -08:00
Geoff Schmidt
ad5f3fff45 Merge remote-tracking branch 'refs/remotes/origin/sso' into sso 2013-12-13 18:18:38 -08:00
Geoff Schmidt
e63837d0aa Fix path binding bug 2013-12-13 18:18:23 -08:00
Geoff Schmidt
3a1e25f647 Comments about DDP path resolution and path prefixes 2013-12-13 18:17:32 -08:00
Slava Kim
cb4a278d4b Revert "Before minifying CSS pull out all @import's to the top of CSS file."
This reverts commit 0d5060eb6a.
This reverts commit f2e3481db3.
2013-12-13 17:53:52 -08:00