Commit Graph

9 Commits

Author SHA1 Message Date
Jeff Morgan d1c6928321 Working ports update 2014-11-24 10:41:02 -05:00
Jeff Morgan 61df95a089 Initial working version of autoupdates 2014-11-11 12:52:57 -05: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 76fcc97290 Adding download method to Util 2014-09-07 23:49:16 -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
Sean Li 0da48eb8bd Moved server code to the client side for performance. 2014-09-03 18:17:46 -07:00
Sean Li 29fbc0cb58 Moved server code to the client side for performance. 2014-09-03 18:17:46 -07:00
Jeff Morgan bdf0949190 Initial commit 2014-08-27 13:45:22 -07:00