Commit Graph

109 Commits

Author SHA1 Message Date
Sean Li 228db73ca0 Fixed app not deleting and form validation not working bug. 2014-09-10 23:41:17 -07:00
Sean Li b3ddb9f607 Fixed tracking not being applied. 2014-09-10 23:18:29 -07:00
Jeff Morgan abf17dbcff Specific verison of boot2docker 2014-09-10 23:17:19 -07:00
Jeff Morgan 31ed93283d 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 3800a90f63 Merge branch 'rc0.2.0' of github.com:kitematic/kitematic into rc0.2.0 2014-09-10 19:39:40 -07:00
Jeff Morgan 59e14fb883 Adding setup page for usage diagnostics 2014-09-10 19:39:25 -07:00
Sean Li f006c36be6 Cleaned package gitignore. 2014-09-10 11:56:28 -07:00
Jeff Morgan 3a88f78a55 Progress for default images and vbox 2014-09-09 16:23:48 -07:00
Jeff Morgan 72085b90f3 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 76fcc97290 Adding download method to Util 2014-09-07 23:49:16 -07:00
Jeff Morgan e59444129c Initial work towards rc0.2.0 2014-09-07 20:20:47 -07:00
Sean Li 1a67c090ba Fixed starting/stopping apps locking up issue. 2014-09-07 14:52:44 -07:00
Sean Li 5d88c4ed87 Added start/stop action in app detail page. 2014-09-06 20:47:24 -07:00
Sean Li 67d90fb882 UX refactor and JSHint. 2014-09-06 20:44:45 -07:00
Sean Li 1f2dbd209a Merge branch 'master' into analytics 2014-09-06 20:26:51 -07:00
Peter Nguyen 47dfb0775d Added feature to start/stop apps 2014-09-06 22:14:09 +02:00
Peter Nguyen 30b6c52edc Added feature to start/stop apps 2014-09-06 22:14:09 +02:00
Sean Li 7fc0fc083b Removed octicons package. 2014-09-06 01:04:27 -07:00
Sean Li 2db3561492 Added GA to track usage analytics and option to disable it. 2014-09-05 19:52:03 -07:00
Sean Li 8645cc60ce Can now select logs. 2014-09-04 12:51:01 -07:00
Sean Li 9e1162eae2 Can now select logs. 2014-09-04 12:51:01 -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 41468cfed7 Bumping virtualbox 2014-09-03 21:02:31 -07:00
Jeff Morgan f263f76b4b Bumping virtualbox 2014-09-03 21:02:31 -07:00
Sean Li b88660c13d Only updates status after dig is ran. 2014-09-03 20:57:26 -07:00
Sean Li 04888e3e5a Only updates status after dig is ran. 2014-09-03 20:57:26 -07:00
Sean Li 718c9cd6e4 Turned off log timestamp. 2014-09-03 20:39:26 -07:00
Sean Li 80bf56c35e Turned off log timestamp. 2014-09-03 20:39:26 -07:00
Sean Li e7426dc6cb Fixed up dig command. 2014-09-03 19:45:34 -07:00
Sean Li 5f2cb41440 Fixed up dig command. 2014-09-03 19:45:34 -07:00
Sean Li fd45571c2e Renamed image rebuild functions. 2014-09-03 19:30:38 -07:00
Sean Li 9ff6af34d5 Renamed image rebuild functions. 2014-09-03 19:30:38 -07:00
Sean Li fdb5437277 Rebuild image restart the apps now. 2014-09-03 19:02:06 -07:00
Sean Li 4ddcc92b9e Rebuild image restart the apps now. 2014-09-03 19:02:06 -07:00
Sean Li b2ea4e0eb0 Fixed missing callback for last setup step. 2014-09-03 18:37:09 -07:00
Sean Li 3c99d4e0d0 Fixed missing callback for last setup step. 2014-09-03 18:37:09 -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 37f19c97f8 Fixing DNS issues, should have been .kite and not .dev 2014-09-02 03:40:29 -07:00
Jeff Morgan a9b6812338 Fixing DNS issues, should have been .kite and not .dev 2014-09-02 03:40:29 -07:00
Jeff Morgan 07ec123939 Linked 2014-09-01 18:12:37 -07:00
Jeff Morgan 8e3db7c30d Linked 2014-09-01 18:12:37 -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 ebfbdc4182 Fixing remaining installer bugs 2014-09-01 15:42:15 -07:00
Jeff Morgan c370a4cf89 Fixing remaining installer bugs 2014-09-01 15:42:15 -07:00
Jeff Morgan b66bbc2c0d Merge branch 'backend-refactor' of github.com:kitematic/kitematic into installer_fix
Conflicts:
	meteor/client/lib/boot2docker.js
	meteor/client/lib/utilities.js
	meteor/client/lib/virtualbox.js
	meteor/client/main.js
	meteor/client/views/dashboard/setup/setup-install.js
	meteor/server/docker.js
2014-09-01 04:00:06 -07:00
Jeff Morgan f5b784491c Merge branch 'backend-refactor' of github.com:kitematic/kitematic into installer_fix
Conflicts:
	meteor/client/lib/boot2docker.js
	meteor/client/lib/utilities.js
	meteor/client/lib/virtualbox.js
	meteor/client/main.js
	meteor/client/views/dashboard/setup/setup-install.js
	meteor/server/docker.js
2014-09-01 04:00:06 -07:00
Jeff Morgan adff625795 Fixing common installer bugs 2014-09-01 03:25:31 -07:00