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
7,785 Commits 1,974 Branches 1,623 Tags
095b3a26c6365011aa3fcad56bb23dfd462016ad
Commit Graph

258 Commits

Author SHA1 Message Date
David Greenspan
095b3a26c6 Merge remote-tracking branch 'origin/devel' into blaze-refactor 
Conflicts:
	packages/spacebars-tests/template_tests.js
	packages/ui/base.js
	packages/ui/dombackend.js
	packages/ui/dombackend_tests.js
	packages/ui/domrange.js
	packages/ui/domrange_tests.js
	packages/ui/each.js
	packages/ui/render.js
	packages/ui/render_tests.js
 2014-06-23 10:56:55 -07:00
Emily Stark
1c12b1a49f Merge branch 'master' into devel 
Conflicts:
	History.md
	packages/accounts-password/password_server.js
	packages/spacebars-tests/template_tests.html
	packages/spacebars-tests/template_tests.js
	packages/ui/base.js
 2014-06-23 08:18:19 -07:00
Emily Stark
fba413d597 update banner, notices, History 2014-06-23 08:04:59 -07:00
Emily Stark
1180597f06 bump dev bundle; upgrade node 2014-06-16 18:17:21 -07:00
Emily Stark
eb4ad2c566 Remove deploy-examples. 
Moving it to automated-unit-tests
 2014-06-12 19:19:36 -07:00
Emily Stark
8d1086aa74 Add spiderable test to deploy-examples 2014-06-12 19:14:49 -07:00
David Greenspan
5c23ec2e36 Merge remote-tracking branch 'origin/devel' into blaze-refactor 2014-06-09 19:58:19 -07:00
Emily Stark
ef3eaa427a Configure parties oauth in deploy-examples 2014-06-09 15:27:17 -07:00
Avital Oliver
76cb9bd36f Minor changes on deploy-example.sh 2014-06-09 14:55:27 -07:00
Avital Oliver
6be92962b3 Updated deploy-examples.sh script for Rainforest QA runs 2014-06-09 14:52:26 -07:00
David Greenspan
3df4e95845 Merge branch 'devel' into blaze-refactor 
Conflicts:
	packages/spacebars-tests/template_tests.js
	packages/ui/domrange.js
 2014-05-27 13:38:59 -07:00
Torgny Bjers
816641caad Adding = to long options for MongoDB compilation 
References meteor/meteor#2163
 2014-05-22 15:57:54 -07:00
Emily Stark
bf8426322c Merge branch 'master' into devel 2014-05-22 09:50:17 -07:00
Emily Stark
ca12a9842d Update History, banner, notices 2014-05-21 21:10:03 -07:00
Emily Stark
bfeabbc5b0 Merge branch 'master' into devel 2014-05-12 17:15:42 -07:00
Emily Stark
5dc48badef Update banner and notices 2014-05-12 17:01:34 -07:00
Avital Oliver
5fe931056b Better error when releasing an unbuilt git sha 2014-05-09 16:30:23 -07:00
Felix Rabe
3431c66c16 Fix occurrences of "cd dirname $0" 
They are not safe for spaces in paths. There might be other places to look for trouble.

I've run the following command to produce this commit: (on OS X, copy-and-pasting the below exactly)

    find . -type f -name '*.sh' -print0  |  # Find all .sh files
        xargs -0 fgrep -H -- '`'         |  # See all places with backticks in them
        fgrep 'cd `dirname $0'           |  # I deemed these problematic (variable assignments are safe)
        cut -d ':' -f 1                  |  # Take the <file> from <file>:<line> produced by "grep -H"
        tr '\n' '\0'                     |  # Also here, spaces can be problematic - always do "xargs -0"!
        xargs -0 -- sed -i '' 's/cd `dirname $0`/cd "`dirname "$0"`"/g'

The significance of adding the two levels of "'s can be verified by running the following in your Terminal:

    $ node -e 'console.log(process.argv.splice(1))' -- `echo 1   2`
    [ '1', '2' ]

    $ node -e 'console.log(process.argv.splice(1))' -- "`echo 1   2`"
    [ '1 2' ]

    $ node -e 'console.log(process.argv.splice(1))' -- "`echo "1   2"`"
    [ '1   2' ]
 2014-05-07 17:51:09 -07:00
David Glasser
f2e2a781cc Update Node to 0.10.28 which includes our npm fix 2014-05-02 10:59:37 -07:00
Emily Stark
de9188f1e8 Merge branch 'master' into devel 
Conflicts:
	History.md
	packages/minifiers/urlrewriting-tests.js
 2014-05-01 12:39:33 -07:00
Emily Stark
399629e941 Merge branch 'release-0.8.1.1' 
The large number of conflicts is because release-0.8.1.1 was branched
off of release/0.8.1 instead of master.

Conflicts:
	History.md
	docs/.meteor/release
	docs/lib/release-override.js
	examples/clock/.meteor/release
	examples/leaderboard/.meteor/release
	examples/parties/.meteor/release
	examples/todos/.meteor/release
	examples/wordplay/.meteor/release
	scripts/admin/banner.txt
	scripts/admin/notices.json
 2014-05-01 12:37:41 -07:00
Emily Stark
629423d514 Update banner and notices 2014-05-01 12:17:24 -07:00
David Glasser
000c71ec30 A better version of our patch 
However, the better version involves taking some changes from a version
of npm not yet released with Node.
 2014-04-30 18:03:53 -07:00
David Glasser
94074c0dcd new dev bundle: with npm/npm#5137 
We should be able to remove our "npm install --force" workaround after
this.
 2014-04-30 18:03:53 -07:00
Emily Stark
4b6d88828e tweak notices 2014-04-30 10:47:37 -07:00
Emily Stark
68f4425841 tweak banner 2014-04-30 10:28:40 -07:00
Emily Stark
9cd32c85ec add line break in notices 2014-04-30 10:23:01 -07:00
Emily Stark
2978ceb96d Update History, banner, notices 2014-04-30 10:21:40 -07:00
David Greenspan
e9c388933f Document Blaze.Var, check in doctool.js 2014-04-29 11:05:03 -07:00
Emily Stark
b6501d4ebe Merge branch 'master' into devel 
Conflicts:
	History.md
	packages/oauth1/oauth1_server.js
 2014-04-21 15:29:31 -07:00
Emily Stark
25e3428132 Add 0.7.2.1 to notices 2014-04-21 15:21:53 -07:00
Emily Stark
700673592c Update notices 2014-04-21 14:51:59 -07:00
Emily Stark
41d36b671a Update banner text 2014-04-21 14:50:56 -07:00
Nick Martin
34581338f0 remove now unused script. 2014-04-08 23:53:05 -07:00
Nick Martin
714e513b99 Upgrade Node.js from 0.10.25 to 0.10.26 2014-04-07 22:56:41 -07:00
Nick Martin
4a1a6816d3 Bump openssl version used for mongo. Add node-aes-gcm. 
The previous version of openssl (1.0.1f) was vulnerable to the 'heartbleed'
attack, though Meteor did not use this version in a way that opened
it to attack. The build of openssl here is used only for mongod, not
node, and was used only as a client, not a server. But lets upgrade anyway.
 2014-04-07 22:50:43 -07:00
David Glasser
6b9c74561f banner and notices rough draft 2014-03-26 20:34:31 -07:00
David Glasser
9cb2131bb6 Check package notices line length 2014-03-26 20:33:56 -07:00
David Glasser
1d9c2443e8 Automatically remove deprecated preserve-inputs 2014-03-26 15:02:34 -07:00
Avital Oliver
748c4db7a3 No more spark and universal-events packages 2014-03-25 19:09:56 -07:00
Nick Martin
294a945e17 update banner text 2014-03-18 14:02:22 -07:00
Nick Martin
668f23f548 first cut banner and notices. 2014-03-18 01:06:10 -07:00
David Glasser
0791b31b30 dev bundle: fork node-http-proxy to fix #1871 2014-03-03 23:15:41 -08:00
Nick Martin
4555d2c8e4 Merge branch 'release-0.7.1.2' 
Conflicts:
	History.md
	docs/.meteor/release
	docs/lib/release-override.js
	examples/leaderboard/.meteor/release
	examples/parties/.meteor/release
	examples/todos/.meteor/release
	examples/wordplay/.meteor/release
	scripts/admin/banner.txt
 2014-02-26 17:57:39 -08:00
Emily Stark
3caa3b9e9c Update banner and notices for 0.7.1.2 2014-02-26 13:51:58 -08:00
Emily Stark
d32d2de1d6 Update banner/notices/History for 0.7.1.1 2014-02-24 13:48:24 -08:00
Matt DeBergalis
f8eec237a6 mention oplog 2014-02-24 12:42:51 -08:00
Nick Martin
48cfc719ef Oops, missed one. Thanks, Tim. 2014-02-23 19:46:29 -08:00
Nick Martin
dd47415027 First cut banner and notices. 2014-02-23 19:00:58 -08:00
Geoff Schmidt
d1d714ec66 'whoami' gracefully handles revocation of a credential 
on a passwordless account. with test
 2014-02-18 17:25:19 -08:00