Commit Graph

464 Commits

Author SHA1 Message Date
Emily Stark
19b8c0012c Merge branch 'master' into devel 2014-09-15 16:49:50 -07:00
Emily Stark
113be020e2 update manifest for 0.9.2.1 2014-09-15 16:45:10 -07:00
Emily Stark
5b823875c5 update meteor-release-official.json for 0.9.2.1 2014-09-15 16:04:04 -07:00
Emily Stark
e8a1287f2a Banner for 0.9.2.1 2014-09-15 16:02:27 -07:00
Emily Stark
ccfee68145 Merge branch 'master' into devel
Conflicts:
	docs/client/api.html
	docs/client/data.js
	docs/client/names.json
	meteor
	packages/autoupdate/package.js
	packages/base64/.gitignore
	packages/constraint-solver/package.js
	packages/device-orientation/.gitignore
	packages/less/package.js
	packages/meteor-tool/package.js
	packages/meteor/package.js
	packages/package-version-parser/package.js
	packages/webapp/webapp_server.js
	scripts/admin/meteor-release-experimental.json
	tools/commands.js
	tools/help.txt
	tools/package-version-parser.js
	tools/run-all.js
	tools/tests/apps/build-errors/packages/with-colon-plugin/.gitignore
2014-09-15 14:48:57 -07:00
Emily Stark
6a7d102371 Update manifest 2014-09-15 12:34:19 -07:00
Emily Stark
833c6f5b4f Bump package versions for 0.9.2 2014-09-15 11:36:57 -07:00
Emily Stark
49cd50d005 Add 0.9.2 banner 2014-09-15 11:25:22 -07:00
Slava Kim
7a459a3cc8 Bump 2014-09-11 17:56:53 -07:00
Emily Stark
d36909a489 bump packages for 0.9.2-rc7 2014-09-11 17:35:06 -07:00
Slava Kim
b1d04b7d06 Bump to rc6 2014-09-11 15:50:30 -07:00
Justin SB
fde605eb18 Prompt user with licensing file before meteor add-platform 2014-09-11 14:52:11 -07:00
Slava Kim
777f6c92d0 Bump the rc version 2014-09-10 18:53:06 -07:00
Slava Kim
fb4fbea3a8 Merge branch 'android_tweaks' into release-0.9.2 2014-09-10 15:51:36 -07:00
Slava Kim
00413f88c3 Merge branch 'cordova-httpd' into release-0.9.2
Conflicts:
	tools/commands-cordova.js
2014-09-10 15:50:49 -07:00
Sashko Stubailo
4f19ac1d9f Add comment explaining change 2014-09-10 15:47:50 -07:00
Sashko Stubailo
0c3e0e786a Make JSDoc like 100 times faster by searching files with grep first
Conflicts:
	scripts/admin/jsdoc/jsdoc.sh
2014-09-10 15:47:17 -07:00
Sashko Stubailo
7c666f929e Make data.js about half the size
Conflicts:
	docs/client/data.js
2014-09-10 15:46:32 -07:00
Sashko Stubailo
5934ecd577 Make data.js smaller 2014-09-10 15:46:04 -07:00
Sashko Stubailo
8ea02e67e3 Merge branch 'devel' into npm-cordova-docs 2014-09-10 15:33:10 -07:00
Justin SB
a20c98f392 Don't include android system images; we download them if required instead 2014-09-10 15:23:45 -07:00
Justin SB
138219e4c7 Don't bundle jvm 2014-09-10 15:23:28 -07:00
Sashko Stubailo
c69447b03c Add comment explaining change 2014-09-10 09:54:26 -07:00
Sashko Stubailo
05507080f6 Make JSDoc like 100 times faster by searching files with grep first 2014-09-10 09:46:30 -07:00
Sashko Stubailo
4b90199024 Make data.js about half the size 2014-09-10 09:28:56 -07:00
Sashko Stubailo
ddd86b00dd Make data.js smaller 2014-09-10 09:22:11 -07:00
Emily Stark
63381e5ee4 Bump package versions for 0.9.2-rc4 2014-09-09 18:59:17 -07:00
Emily Stark
3f680f76a4 Bump package versions for 0.9.2-rc3 2014-09-09 11:11:38 -07:00
Emily Stark
fb3fb5de03 Bump package versions for 0.9.2-rc2 2014-09-09 07:52:41 -07:00
Justin SB
05b84fcc5e Create avd with x86 (ARM cannot be accelerated) 2014-09-09 07:26:20 -07:00
Justin SB
4c4317badf Use a more common mirror for apache ant download 2014-09-09 07:14:58 -07:00
Sashko Stubailo
74cf848f2d Merge branch 'devel' into jsdocfinal 2014-09-07 10:09:47 -07:00
Avital Oliver
ac1898b313 Merge tag 'release/METEOR@0.9.1.1' into release-0.9.2
Conflicts:
	packages/meteor-platform/package.js
	packages/meteor-tool/package.js
	packages/reactive-dict/package.js
2014-09-06 19:35:18 -07:00
Avital Oliver
0f7ae4b0f7 Merge branch 'master' into devel
Conflicts:
	packages/meteor-tool/package.js
2014-09-06 18:59:01 -07:00
Avital Oliver
9db3ec88d7 A bunch more file updates for 0.9.1.1 2014-09-06 17:14:07 -07:00
Avital Oliver
3b1651b82b 0.9.1 -> 0.9.1.1 banner 2014-09-06 14:57:48 -07:00
Avital Oliver
0fba72f9db More prep for 0.9.1.1 2014-09-06 14:23:27 -07:00
Avital Oliver
6d883482cd History.md for 0.9.1.1 2014-09-06 13:50:18 -07:00
Slava Kim
3e5e8dcdec bump version 2014-09-05 17:40:46 -07:00
Slava Kim
6ca6641a34 Merge branch 'master' into release-0.9.2
Includes latest 0.9.1 changes

Conflicts:
	examples/leaderboard/.meteor/versions
	examples/parties/.meteor/versions
	examples/todos/.meteor/versions
	packages/accounts-base/package.js
	packages/accounts-ui-unstyled/package.js
	packages/autoupdate/package.js
	packages/constraint-solver/package.js
	packages/facebook/package.js
	packages/github/package.js
	packages/google/package.js
	packages/http/package.js
	packages/less/package.js
	packages/meetup/package.js
	packages/meteor-developer/package.js
	packages/meteor-platform/package.js
	packages/meteor-tool/package.js
	packages/meteor/package.js
	packages/minimongo/package.js
	packages/oauth/package.js
	packages/oauth1/package.js
	packages/reload/package.js
	packages/templating/package.js
	packages/twitter/package.js
	packages/webapp/package.js
	packages/weibo/package.js
	scripts/admin/meteor-release-experimental.json
	tools/help.txt
	tools/tests/apps/hot-code-push-test/.meteor/versions
2014-09-05 11:28:12 -07:00
Sashko Stubailo
586b6e2712 Auto document a lot more things 2014-09-04 21:42:03 -07:00
Sashko Stubailo
cb5c2c543d Document allow and deny
Add option for comma-separated options and arguments
2014-09-04 19:54:56 -07:00
Avital Oliver
186579ea5e Merge branch 'master' into devel
Conflicts:
	examples/todos/.meteor/versions
	packages/autoupdate/package.js
	packages/constraint-solver/package.js
	packages/less/package.js
	packages/meteor-tool/package.js
	packages/meteor/package.js
	scripts/admin/meteor-release-experimental.json
	tools/help.txt
	tools/tests/apps/hot-code-push-test/.meteor/versions
2014-09-04 16:56:19 -07:00
Avital Oliver
78577b26a2 docs on 0.9.1 2014-09-04 16:43:55 -07:00
Avital Oliver
7164544dad No newline in banners.json 2014-09-04 16:07:16 -07:00
Avital Oliver
c23408bdd7 versions for 0.9.1 2014-09-04 15:41:39 -07:00
Emily Stark
4bceab441b Banners for 0.9.1 2014-09-04 12:13:30 -07:00
Emily Stark
1a946cd326 Bump package versions for 0.9.1-rc4 2014-09-04 11:50:27 -07:00
Slava Kim
a6c4ed6e6e Merge branch 'release-0.9.1' into release-0.9.2
Conflicts:
	packages/autoupdate/package.js
	packages/meteor-tool/package.js
	packages/meteor/package.js
	scripts/admin/meteor-release-experimental.json
2014-09-02 13:49:21 -07:00
Avital Oliver
e46cb23037 0.9.1-rc3 2014-08-31 23:45:24 -07:00