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
9,894 Commits 1,974 Branches 1,623 Tags
release/METEOR@0.9.2-rc0
Commit Graph

2376 Commits

Author SHA1 Message Date
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
Slava Kim
0b6cf4f2ca Add a special 'cordova-build-override' folder. 
Basically right before the `cordova build` we `cp -R` that folder into our
cordova project. Allows users to overwrite any part of the build, it might be
config.xml, app icons or even crosswalk.
 2014-08-29 18:55:54 -07:00
Slava Kim
2b1e5b80b8 Kill unused cordova.preparePlatforms 2014-08-29 18:06:23 -07:00
Sashko Stubailo
82d1db5107 Rename Meteor.Collection to Mongo.Collection again 2014-08-29 12:28:32 -07:00
Sashko Stubailo
6b3d31ff5b Revert "Rename Meteor.Collection -> Mongo.Collection" 
This reverts commit 96952dda2b.

Conflicts:
	packages/ddp/livedata_tests.js
	packages/minimongo/minimongo.js
	packages/mongo/collection.js
	packages/mongo/mongo_driver.js
	packages/mongo/mongo_livedata_tests.js
	packages/mongo/oplog_tests.js
	packages/reactive-dict/reactive-dict.js
	packages/session/session_tests.js
	tools/auth.js
 2014-08-29 12:26:28 -07:00
Matthew Arbesfeld
611298fb50 Merge branch 'cordova-hcp' into devel 
Conflicts:
	packages/deps/package.js
	packages/reload/reload.js
	tools/tests/apps/hot-code-push-test/.meteor/versions
 2014-08-29 12:08:34 -07:00
Sashko Stubailo
84f1fcace1 Fix docs and self-test 2014-08-29 11:52:33 -07:00
Matthew Arbesfeld
18e414caea Remove unused code from hot-code-push-test 2014-08-29 11:46:39 -07:00
Matthew Arbesfeld
0bf177ca0b Create more hot code push tests and let --browserstack use many browsers. 2014-08-29 11:07:13 -07:00
Sashko Stubailo
96952dda2b Rename Meteor.Collection -> Mongo.Collection 2014-08-29 10:11:21 -07:00
Slava Kim
a02cb37ca7 Also set ANDROID_SDK_HOME 
Hopefully will help with the "PANIC" crash of android emulator
 2014-08-29 01:19:33 -07:00
Slava Kim
1078a6eeb4 Put cordova.sh back to the list of commands requesting android_bundle 2014-08-29 00:43:07 -07:00
Matthew Arbesfeld
fca5c382d5 Merge branch 'release-0.9.1' into cordova-hcp 
Conflicts:
	docs/client/api.html
	docs/client/api.js
	meteor
	packages/autoupdate/autoupdate_server.js
	packages/autoupdate/package.js
	packages/constraint-solver/package.js
	packages/less/package.js
	packages/meteor-tool/package.js
	packages/meteor/package.js
	packages/minimongo/package.js
	packages/mongo-livedata/package.js
	packages/oauth1/package.js
	packages/package-version-parser/package.js
	packages/spiderable/package.js
	packages/standard-app-packages/package.js
	packages/templating/package.js
	packages/test-in-console/package.js
	packages/webapp/package.js
	scripts/admin/meteor-release-experimental.json
	scripts/generate-dev-bundle.sh
	tools/uniload.js
 2014-08-28 21:13:59 -07:00
Slava Kim
76f0836e37 Another workaround for old Android browser's quircks around Event constructor 2014-08-28 18:07:34 -07:00
Slava Kim
02755faf0d adb from global path 2014-08-28 17:49:42 -07:00
Slava Kim
a65f825d4f Push the default HOME value 2014-08-28 17:42:14 -07:00
Sashko Stubailo
aafd8a0d3e Merge branch 'release-0.9.1' into ddp 
Conflicts:
	packages/livedata/package.js
 2014-08-28 17:16:38 -07:00
Sashko Stubailo
c4e0ec5a14 Merge branch 'release-0.9.1' into mongo 
Conflicts:
	packages/mongo-livedata/package.js
 2014-08-28 17:15:06 -07:00
Slava Kim
02164d5cc8 If USE_GLOBAL_ADK is specified, don't try to 
install android_bundle and use globally available
java, javac, android and ant
 2014-08-28 17:10:24 -07:00
Slava Kim
5de5ba462b More logging, propagate the 'USE_GLOBAL_ADK' env variable 2014-08-28 17:10:03 -07:00
Slava Kim
81e216c599 Ignore failures of logcat -c 2014-08-28 16:10:05 -07:00
Slava Kim
54155531a1 more verboseness, adb.sh permissions 2014-08-28 16:00:19 -07:00
Slava Kim
50a5d7f7f8 Make the verbose mode actually verbose 2014-08-28 15:34:34 -07:00
Matthew Arbesfeld
3f821867d0 Don't rewrite relative paths for cordova builds. 
Cordova relies on relative paths to base href to choose its public
assets.
 2014-08-28 15:31:07 -07:00
Matthew Arbesfeld
0af50c04ef Change client.* to web.* and accept client and web 2014-08-28 13:35:26 -07:00
Sashko Stubailo
c24e96ff83 Update deps to tracker in self-test 2014-08-28 13:25:01 -07:00
Sashko Stubailo
3189a364e9 Rename livedata to ddp, meteor test-packages passes 2014-08-28 12:53:34 -07:00
Slava Kim
91b193d5fb Add 'configure-android' command 2014-08-28 12:34:53 -07:00
Sashko Stubailo
932ab597b0 Merge branch 'release-0.9.1' of github.com:meteor/meteor into release-0.9.1 2014-08-28 12:04:33 -07:00
Sashko Stubailo
6f72a3c649 Update deps to tracker in self-test 2014-08-28 12:04:27 -07:00
Sashko Stubailo
34231601cc Update deps to tracker in self-test 2014-08-28 12:02:53 -07:00
David Glasser
3d10208869 Fix 'meteor list' if not all packages on server 
Fixes #2468.  Regression from 0.9.0.
 2014-08-28 11:38:00 -07:00
Sashko Stubailo
be8c503760 Rename mongo-livedata to mongo 2014-08-28 11:14:40 -07:00
Emily Stark
3f6ad09361 Change a thrown exception to 'selftest.fail' 2014-08-28 09:03:34 -07:00
Slava Kim
579396329a Refactor bash scripts to a single import + a bunch of executables. 
Also always store android_bundle in the warehouse, because right now we download
it every time the meteor-tool changes (even if the android_bundle version didn't
change). It is still not ideal, as it will download a new binary every time you
switch between meteor-tool versions pointing at different android_bundle
versions.
 2014-08-27 23:17:33 -07:00
Emily Stark
87bac7820d Remove some more strict checks in auth tests. 
They're too strict for universe output.
 2014-08-27 22:54:35 -07:00
Sashko Stubailo
ab0e177561 Rename standard-app-packages to meteor-platform 
Summary: Also update the skeleton app to use meteor-platform

Test Plan: Created a new app, it had meteor-platform, it ran

Reviewers: dgreenspan

Reviewed By: dgreenspan

CC: avital, emily, nim

Differential Revision: https://phabricator.meteor.com/D785
 2014-08-27 22:04:08 -07:00
Sashko Stubailo
a3cec3b6dc Rename standard-app-packages to meteor-platform 2014-08-27 21:14:34 -07:00
Emily Stark
c21ed42a33 Remove 'expectEnd' from login test. 
It'll fail if we have a universe file, because the universe will get
printed.
 2014-08-27 19:36:57 -07:00
Emily Stark
28ec9e62d2 Start crash count reset timer only after app is bundled. 
Change the timeout back to what it was before 0.9.0
 2014-08-27 18:56:32 -07:00
Emily Stark
3e999c4f69 Fix authorized test for DEPLOY_HOSTNAME 2014-08-27 15:56:08 -07:00
Emily Stark
1b9f57322b Add packages organizations selftest 2014-08-27 15:56:08 -07:00
Emily Stark
d5e3b2691a Make test packages server URL universe-friendly 2014-08-27 15:56:07 -07:00
Emily Stark
fc1b3e596e Don't require test package server to have 'standard-app-packages' 2014-08-27 15:56:07 -07:00
Slava Kim
1bb44c3cd1 Clean up the cache folder on every startup, so we don't keep all versions of 
your app on disk forever.
 2014-08-27 15:40:57 -07:00
Matthew Arbesfeld
bd86ed3450 Use <base href> tag to load from persistent storage. 
This lets us use the correct path for assets in the `public` folder.
 2014-08-27 15:33:00 -07:00
Matthew Arbesfeld
75427d70ce Merge branch 'devel' into cordova-hcp 
Conflicts:
	docs/client/docs.js
	examples/leaderboard/.meteor/versions
	meteor
	packages/backbone/package.js
	packages/constraint-solver/package.js
	packages/meetup/package.js
	packages/meteor-tool/package.js
	packages/showdown/package.js
	packages/stylus/package.js
	scripts/admin/meteor-release-experimental.json
	tools/commands-packages.js
	tools/commands.js
	tools/project.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-08-27 13:38:57 -07:00
Emily Stark
d059106bba Remove dead 'admin remove-member' command 2014-08-27 08:56:34 -07:00
Emily Stark
f7c4e8a3b4 Rename orgs commands 2014-08-27 08:54:19 -07:00
Emily Stark
f17be05c79 Clean up some organization commands error handling. 
Particularly when we have an expired/revoked token.
 2014-08-27 08:54:19 -07:00