github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,462 Commits 1,974 Branches 1,623 Tags
release/sso-6
Commit Graph

752 Commits

Author SHA1 Message Date
Emily Stark
b296dcbdf2 Merge remote-tracking branch 'origin/devel' into sso 
Conflicts:
	packages/accounts-base/accounts_server.js
 2014-01-02 17:46:01 -08:00
Emily Stark
b44855d70d Send user agent info with galaxy logins 2013-12-31 18:38:03 -08:00
David Glasser
178734b66d Fix test broken by 0f4a21f (thanks @awwx). 2013-12-23 15:17:36 -08:00
David Glasser
7341966f49 Fix incorrect Node version number 
Fixes #1701
 2013-12-20 14:34:06 -08:00
David Glasser
36bad38aa0 Merge branch 'master' into devel 
Conflicts:
	tools/mongo_runner.js
 2013-12-20 14:26:27 -08:00
David Glasser
d98b7ed423 Don't call onListen more than once 
eg, maybe the replset loses and regains its PRIMARY.
 2013-12-20 13:51:29 -08:00
David Glasser
96c9076544 Don't leave invalid METEOR-PORT files around 
Could cause mongo startup to hang.

Reproduction:

  $ meteor
  => Meteor server running on: http://localhost:3000/
  # ... wait for server to start, ctrl-c.
  # leaves '3002' in .meteor/local/db/METEOR-PORT
  $ meteor -p 5000
  # ctrl-c in about a second: once we've wiped the old local db
  # but before we've configured the new one.
  # before this commit, '3002' is still in the METEOR-PORT file.
  $ meteor
  # before this commit, hangs with:
  Initializing mongo database... this may take a moment.
 2013-12-20 13:51:28 -08:00
David Glasser
995d728278 mongo_runner: Don't send rs.initiate too early 
Fixes #1696. Thanks to @Maxpain177 for reporting and providing access to
a machine where this was easily reproducible.
 2013-12-20 13:51:28 -08:00
David Glasser
56229c9bc9 tools utils.readLine: no shmancy ANSI in M-x shell 
Also, isTTY is not a function.
 2013-12-19 22:36:31 -08:00
David Glasser
c0626667ec Don't leave invalid METEOR-PORT files around 
Could cause mongo startup to hang.

Reproduction:

  $ meteor
  => Meteor server running on: http://localhost:3000/
  # ... wait for server to start, ctrl-c.
  # leaves '3002' in .meteor/local/db/METEOR-PORT
  $ meteor -p 5000
  # ctrl-c in about a second: once we've wiped the old local db
  # but before we've configured the new one.
  # before this commit, '3002' is still in the METEOR-PORT file.
  $ meteor
  # before this commit, hangs with:
  Initializing mongo database... this may take a moment.
 2013-12-19 18:21:20 -08:00
David Glasser
7424bb63cd mongo_runner: Don't send rs.initiate too early 
Fixes #1696. Thanks to @Maxpain177 for reporting and providing access to
a machine where this was easily reproducible.
 2013-12-19 17:49:53 -08:00
Geoff Schmidt
b9f63839e6 Merge branch 'devel' into sso 2013-12-19 17:17:01 -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
Geoff Schmidt
a314eb7d62 Switch from cookies to headers for Meteor auth 2013-12-18 15:36:04 -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
Emily Stark
373bc2ceec Allow overwriting ~/.meteorsession file with env var. 
Useful for tests.
 2013-12-16 22:03:50 -08:00
Emily Stark
546c344b3d Merge branch 'devel' into sso 
Conflicts:
	packages/ctl-helper/ctl-helper.js
	packages/webapp/webapp_server.js
 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
Emily Stark
63c7aecbda Remove stray space on galaxy login 2013-12-16 14:32:33 -08:00
Nick Martin
9dfa0ee95f Update tools tests for Webapp bundled asset change 6eccf8c 2013-12-15 17:17:41 -08:00
ekatek
4ab6f8ee88 tags 2013-12-13 10:03:35 -08:00
Naomi Seyfer
276034617a First version of a reload safetybelt against javascript or css not being loaded properly 2013-12-13 10:03:35 -08:00
ekatek
7da8004ddf version as tag 2013-12-13 10:03:35 -08:00
Emily Stark
4ba6d3f08d Correct use of on galaxy login 2013-12-12 23:34:22 -08:00
Geoff Schmidt
ab87768a7e Merge remote-tracking branch 'origin/devel' into sso 
Conflicts:
	packages/accounts-password/password_tests.js
	tools/meteor.js
 2013-12-12 18:51:45 -08:00
Geoff Schmidt
15730a89ce Merge branch 'refs/heads/sso' into sso2 
Conflicts:
	tools/auth.js
 2013-12-12 17:40:49 -08:00
Nick Martin
04fddf3a77 Update tools tests for Webapp bundled asset change 6eccf8c 2013-12-11 20:38:51 -08:00
David Glasser
8de5ebfc6f Become able to kill mongod spawned by pre-oplog branches 2013-12-11 17:04:06 -08:00
Geoff Schmidt
ad680517ee delete obsolète comment 2013-12-11 05:57:20 -08:00
Geoff Schmidt
f590c2567a better handling of bad userids 2013-12-11 05:54:47 -08:00
Geoff Schmidt
7d7474aacb Print correct username when logging in. 2013-12-11 04:51:21 -08:00
Geoff Schmidt
410a585d76 Deferred registration! 2013-12-11 04:26:01 -08:00
Nick Martin
89ec9ddf62 Up timeout for printing mongo message. This way it doesn't happen normally during cold start (3--4 sec). 2013-12-10 22:13:12 -08:00
Geoff Schmidt
ff4e229b4a Session file: support being logged in with no username 2013-12-10 20:53:21 -08:00
Geoff Schmidt
de55d62645 track username separately in each universe 2013-12-10 20:16:58 -08:00
David Glasser
b4c14af032 Fix find_mongo_pids regexp 
Also add some comments to mongod options.
 2013-12-10 19:09:41 -08:00
Nick Martin
f9b394de4f Use smaller oplog (8MB instead of 256MB default). 
This uses less space on disk and starts up faster. It might mean
people hit the end of the oplog if the server gets really slow.
But, hey, then we can debug and test more oplog error modes.
 2013-12-10 17:47:49 -08:00
Geoff Schmidt
0ff03113f4 Refactor session file handling 2013-12-10 17:10:16 -08:00
Emily Stark
71fbcb4f28 Fix call to DDP.connect with cookie header 2013-12-10 17:01:13 -08:00
Geoff Schmidt
95667c3a10 log out correctly across universe changes 2013-12-10 16:57:46 -08:00
Emily Stark
740e0ff1a0 Allow galaxy discovery urls to have https:// already 2013-12-10 16:54:24 -08:00
Emily Stark
3d29f1f018 Update auth urls 2013-12-10 16:54:12 -08:00
Nick Martin
1b08ac2d9d Upgrade to stock Node 0.10.22. 
This discards our fix for stream pausing. We'll monkey patch it in
at startup instead of relying on a custom build.
 2013-12-10 15:27:40 -08:00
Geoff Schmidt
9d90a453cb cosmetic changes 2013-12-09 10:01:53 -08:00
Geoff Schmidt
14337d416c support meteor --get-ready for warehouse installs too 2013-12-09 04:18:54 -08:00
Geoff Schmidt
3f849d5c64 Fix bug that causes tokens to be revoked over and over again 2013-12-08 23:54:44 -08:00
Geoff Schmidt
cbafd31eae Use node os.hostname() in preference to $HOST. 2013-12-08 23:54:14 -08:00
Geoff Schmidt
d168857ab6 refactor http auth 2013-12-08 05:58:08 -08:00
Geoff Schmidt
89d6260a84 Provide hostname for web-based credential revocation UI 2013-12-07 20:20:53 -08:00