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,972 Commits 1,974 Branches 1,623 Tags
452da56297390cbc37d8c2a810ff097fee61ba08
Commit Graph

66 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
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
Matthew Arbesfeld
0af50c04ef Change client.* to web.* and accept client and web 2014-08-28 13:35:26 -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
David Glasser
131b73bc71 update tools/tests id files 
really, these directories shouldn't have the files, we should copy to a
temp dir...
 2014-08-22 17:33:36 -07:00
Matthew Arbesfeld
9c7d279dcf Some test fixes 2014-08-20 23:06:59 -07:00
Matthew Arbesfeld
8907c2349d rm -rf when platform change 
Hack introduced because Cordova doesn't properly manage your plugins.
 2014-08-20 00:40:17 -07:00
Matthew Arbesfeld
207378bc83 Fix settings logic 2014-08-08 17:04:28 -07:00
Matthew Arbesfeld
9f2ee36e60 Merge branch 'packaging' into cordova-hcp 
Conflicts:
	packages/constraint-solver/constraint-solver-tests.js
	packages/constraint-solver/constraint-solver.js
	packages/less/plugin/compile-less.js
	packages/meteor/plugin/basic-file-types.js
	packages/star-translate/translator.js
	packages/stylus/plugin/compile-stylus.js
	packages/templating/plugin/compile-templates.js
	packages/webapp/webapp_server.js
	tools/bundler.js
	tools/commands.js
	tools/compiler.js
	tools/package-source.js
	tools/run-app.js
	tools/selftest.js
	tools/tests/old/test-bundler-assets.js
	tools/tests/old/test-bundler-options.js
	tools/unipackage.js
 2014-08-06 13:43:56 -07:00
David Glasser
ddc3657e4f Watch files which fail before emitting a resource 
Regression introduced by the CSS watching code (specifically, f230eba62)
by the sourceIsWatched check. We need to be able to tell the difference
between "source handler didn't do anything because there was an error"
and "source handler didn't do anything because it's web-specific and
this is an os arch".

A simple fix would have been to interpret compileStep.error as
"sourceIsWatched = true", but I didn't think of that until after doing
it the slightly more complicated but more precise way :)

Also, ensure that if the runner rebuilds the client and there's an
error, it properly kills the app process (and the watchers and the
keepalive interval, etc).
 2014-08-04 21:32:22 -07:00
Matthew Arbesfeld
b8ae210d9b Add documentation 2014-07-28 17:12:26 -07:00
Matthew Arbesfeld
55fe8a8aae Fix hot code push client-side reloads. 
We were overwriting the server directory when a client-side file changed,
which made all process calls fail, such as process.cwd() and fs.*. We
abstracted out some of the builder code so that only the client targets
are "rebuilt" when a client side file changes.
 2014-07-28 17:12:26 -07:00
Matthew Arbesfeld
5e3c5333a0 Adjust tests for plugins 2014-07-28 13:33:47 -07:00
Matthew Arbesfeld
0c66b87b56 Merge branch 'packaging-fix-server-dir' into cordova-hcp 
Conflicts:
	tools/bundler.js
 2014-07-28 12:25:53 -07:00
Matthew Arbesfeld
cd6cbe9a79 Add documentation 2014-07-25 17:31:05 -07:00
Matthew Arbesfeld
5827607c48 Fix hot code push client-side reloads. 
We were overwriting the server directory when a client-side file changed,
which made all process calls fail, such as process.cwd() and fs.*. We
abstracted out some of the builder code so that only the client targets
are "rebuilt" when a client side file changes.
 2014-07-25 17:16:37 -07:00
Matthew Arbesfeld
960f8907d3 Merge branch 'packaging' into cordova-hcp 
Conflicts:
	packages/constraint-solver/constraint-solver.js
	packages/webapp/webapp_server.js
	tools/tests/package-tests.js
 2014-07-25 13:52:34 -07:00
Avital Oliver
a6db03f131 Unbreak hot code push test by eliminating references to non-existent spacebars-common package 2014-07-23 20:27:35 -07:00
Slava Kim
d4d391f50a Fixed settings.json for cordova test 2014-07-22 19:25:23 -07:00
Matthew Arbesfeld
4f7bbd47df Add settings.json for cordova settings 2014-07-22 18:20:13 -07:00
Slava Kim
e79580cd80 Corrections to "change plugins" cordova test 2014-07-22 13:57:37 -07:00
Matthew Arbesfeld
6a726e5843 Add package2.js 2014-07-22 13:42:07 -07:00
Slava Kim
b64a644671 Merge branch 'packaging-matt-cordova' into packaging-client-archs 
Contains commands for cordova (ie `meteor cordova serve`) and tests for them.
 2014-07-22 13:15:26 -07:00
Matthew Arbesfeld
1f12fb47b0 Add missing package2.js file 2014-07-22 11:50:05 -07:00
Matthew Arbesfeld
d24886bd8d Add test file .js 2014-07-22 11:44:33 -07:00
Matthew Arbesfeld
03c5c425f8 Hard code in client.cordova and fix 'browser' references 2014-07-18 18:59:00 -07:00
Matthew Arbesfeld
fba32514e3 Something working 2014-07-18 16:42:42 -07:00
Matthew Arbesfeld
fb5cf61a8e Add multiple client arches, this is a WIP 2014-07-17 20:53:47 -07:00
Matthew Arbesfeld
50ec6b68ea wip 2014-07-17 16:11:52 -07:00
ekatek
0a64950d6a oops, adding a test file from a few tests ago 2014-07-17 15:41:39 -07:00
Matthew Arbesfeld
b5b55bb792 Add test, not passing 2014-07-14 14:14:50 -07:00
Matthew Arbesfeld
0fc0fce64a Fix Avi's comments. 2014-07-09 10:53:21 -07:00
Matthew Arbesfeld
ee0b9eea51 Update tests 2014-07-09 10:31:44 -07:00
Matthew Arbesfeld
4b88e70629 Fix client css insert 2014-07-09 10:31:44 -07:00
Matthew Arbesfeld
f230eba62b Client CSS and template injection. 2014-07-09 10:31:44 -07:00
ekatek
8ed9d3459c removed some name fields, changes console.log to process.std[out,err].write in commands-packages and gave user a warning to remember to publish for arch. 2014-07-08 22:41:21 -07:00
Matthew Arbesfeld
ff3c9746f0 Implement client side testing for self-test. 
This patch enables a user to pass --phantomjs and/or --browserstack to
`meteor self-test` to run tests against a connected client.
 2014-07-01 18:12:07 -07:00
Emily Stark
e8b1fddc4e Do a 'meteor run' in report-stats test. 
It tests that stats get sent on 'meteor run', and also is faster than
bundling.
 2014-06-25 11:12:12 -07:00
Emily Stark
4b58ba4d99 A steaming pile of hacks to get report-stats test passing. 2014-06-25 11:12:12 -07:00
Emily Stark
c2ccbd5f8b Don't print weird things when packages have no descriptions. 2014-06-24 16:25:41 -07:00
David Glasser
2e5adc2659 fix autoupdate test 
also fixes a bunch of other stuff like:

- parseStack markTop works again (so you get the right line numbers in
  self-test)

- you can (with appropriate env var) run apps with NO PACKAGES at
  all (even ctl)

- more consistently refer to METEOR-CORE@ releases as "Meteor 1.2.3"
 2014-06-17 14:26:29 -07:00
ekatek
2ddc63e538 project safeToUse to solve infinite loops in tests 2014-05-28 18:16:12 -07:00
ekatek
5f8b1be152 split catalog in two 2014-05-27 12:17:57 -07:00
ekatek
d2d82556f3 add release file to this test 2014-05-06 13:42:18 -07:00