Commit Graph

22 Commits

Author SHA1 Message Date
Jeff Morgan 4fb57eb4c1 Fixing breaking bug if old version of virtualbox is installed. 2014-09-12 02:12:20 -07:00
Jeff Morgan 388e7a0dc5 Fixing remaining bugs. 2014-09-11 16:16:19 -07:00
Sean Li 57c7ec5355 Window options to allow loading local files. 2014-09-10 23:31:54 -07:00
Jeff Morgan 691b766ec5 Fixing HEAD in index.js 2014-09-10 23:03:44 -07:00
Jeff Morgan e8fe955cfd Merge branch 'master' into rc0.2.0
Conflicts:
	index.js
	meteor/.meteor/packages
	meteor/client/lib/apputil.js
	meteor/client/lib/boot2docker.js
	meteor/client/lib/docker.js
	meteor/client/lib/installer.js
	meteor/client/lib/router.js
	meteor/client/lib/startup.js
	meteor/client/lib/util.js
	meteor/client/lib/virtualbox.js
	meteor/client/views/dashboard/apps/dashboard-apps-settings.js
	meteor/client/views/dashboard/apps/dashboard-single-app.js
	meteor/client/views/dashboard/components/modal-create-image.js
	meteor/client/views/dashboard/images/dashboard-images-settings.js
	meteor/client/views/dashboard/setup/setup-install.html
	meteor/client/views/dashboard/setup/setup-install.js
	meteor/client/views/dashboard/setup/setup-layout.html
	meteor/server/publications.js
	meteor/smart.json
	meteor/smart.lock
	package.json
	resources/install
	script/dist.sh
	script/setup.sh
	script/versions.sh
2014-09-10 22:28:26 -07:00
Jeff Morgan 4433b91982 Reverting atom-shell native meteor require changes 2014-09-10 22:07:23 -07:00
Jeff Morgan 22b1c3f873 Adding setup page for usage diagnostics 2014-09-10 19:39:25 -07:00
Jeff Morgan a2b6d62420 Fixing mainWindow undefined error 2014-09-09 17:03:02 -07:00
Jeff Morgan 8ebc911f85 Merge branch 'analytics' of github.com:kitematic/kitematic into rc0.2.0
Conflicts:
	index.js
	meteor/.meteor/packages
	meteor/client/views/dashboard/layouts/dashboard-apps-layout.js
2014-09-07 23:51:25 -07:00
Jeff Morgan e59444129c Initial work towards rc0.2.0 2014-09-07 20:20:47 -07:00
Sean Li e1f1f41efb Added GA to track usage analytics and option to disable it. 2014-09-05 19:52:03 -07:00
Jeff Morgan 000d916693 Merge branch 'backend-refactor' of github.com:kitematic/kitematic into installer_fix
Conflicts:
	meteor/client/lib/docker.js
	meteor/client/lib/validations.js
	meteor/client/lib/virtualbox.js
	meteor/lib/validations.js
	meteor/server/apps.js
	meteor/server/lib/validations.js
2014-09-04 02:39:13 -07:00
Jeff Morgan effef0c2e6 Merge branch 'backend-refactor' of github.com:kitematic/kitematic into installer_fix
Conflicts:
	meteor/client/lib/docker.js
	meteor/client/lib/validations.js
	meteor/client/lib/virtualbox.js
	meteor/lib/validations.js
	meteor/server/apps.js
	meteor/server/lib/validations.js
2014-09-04 02:39:13 -07:00
Jeff Morgan 6402782215 Adding update process 2014-09-01 17:19:19 -07:00
Jeff Morgan dc1cb0caec Adding update process 2014-09-01 17:19:19 -07:00
Jeff Morgan 448f22d430 Remove mongod.lock upon restart 2014-09-01 15:55:13 -07:00
Jeff Morgan 21f4ca0565 Remove mongod.lock upon restart 2014-09-01 15:55:13 -07:00
Jeff Morgan d5329f47e2 Fixing installer & mongodb startup bug. 2014-08-29 10:49:26 -07:00
Jeff Morgan 6a6f21fa51 Fixing installer & mongodb startup bug. 2014-08-29 10:49:26 -07:00
Jeff Morgan aa0bf724ae Adding Node.js 0.10.29 into the bundle so the server portion runs
separately. Fixing DNS caching bug using dig.
2014-08-27 18:12:55 -07:00
Jeff Morgan 740efe16d1 Fixing install bugs 2014-08-27 16:04:32 -07:00
Jeff Morgan bdf0949190 Initial commit 2014-08-27 13:45:22 -07:00