Commit Graph

191 Commits

Author SHA1 Message Date
Jeff Morgan b95a2adb1e Adding CFBundleName for script 2014-09-11 15:45:54 -07:00
Jeff Morgan 785907daf9 Bump version 2014-09-11 15:42:42 -07:00
Sean Li c087a77501 Fixed a bug where creating image without volume hangs. 2014-09-11 15:34:25 -07:00
Sean Li 0b0a50e403 Fixed bug with copying folder. 2014-09-11 15:05:57 -07:00
Sean Li f0b5366b4b Merge branch 'master' of https://github.com/kitematic/kitematic 2014-09-11 00:24:57 -07:00
Sean Li d2820cb6e8 Merge branch 'rc0.2.0' 2014-09-11 00:24:30 -07:00
Sean Li a4ac441674 Fixed bug with GA not tracking. 2014-09-11 00:24:12 -07:00
Sean Li 010e19f9ac Merge pull request #68 from kitematic/rc0.2.0
Release candidate 0.2.0 changes.
2014-09-11 00:02:09 -07:00
Sean Li e6f1e50bc5 JSHint. 2014-09-10 23:50:12 -07:00
Jeff Morgan b52105afa0 Merge branch 'rc0.2.0' of github.com:kitematic/kitematic into rc0.2.0 2014-09-10 23:43:20 -07:00
Jeff Morgan 51658b92d9 Fixing boot2docker call in removeBindFolder 2014-09-10 23:42:59 -07:00
Sean Li 228db73ca0 Fixed app not deleting and form validation not working bug. 2014-09-10 23:41:17 -07:00
Sean Li 492efafb09 Window options to allow loading local files. 2014-09-10 23:31:54 -07:00
Jeff Morgan 6c0d5804d6 Merge branch 'rc0.2.0' of github.com:kitematic/kitematic into rc0.2.0 2014-09-10 23:21:11 -07:00
Jeff Morgan 5ecc814eb2 Removing old versions script 2014-09-10 23:20:38 -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 c5b7e2ae6c Fixing HEAD in index.js 2014-09-10 23:03:44 -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 98c2de58b3 Reverting atom-shell native meteor require changes 2014-09-10 22:07:23 -07:00
Jeff Morgan f691f95beb fixing route daemon 2014-09-10 21:51:42 -07:00
Jeff Morgan 1dd004b7be Fixing bug where reboot would cause view clicks to fail 2014-09-10 20:29:53 -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 c1907be3d2 Fixing mainWindow undefined error 2014-09-09 17:03:02 -07:00
Jeff Morgan e398e44245 removing vbox and base images files 2014-09-09 16:25:58 -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
Jeffrey Morgan bd339c8f5c Merge pull request #63 from pengux/master
Added feature to start/stop apps
2014-09-06 14:36:23 -07:00
Jeffrey Morgan 39d8a8f100 Merge pull request #63 from pengux/master
Added feature to start/stop apps
2014-09-06 14:36:23 -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 38181a9579 Merge branch 'rc' 2014-09-04 12:51:24 -07:00
Sean Li 2911986748 Merge branch 'rc' 2014-09-04 12:51:24 -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
Jeffrey Morgan c1bdb79908 Update README.md 2014-09-04 00:27:50 -07:00
Jeffrey Morgan c3009506dc Update README.md 2014-09-04 00:27:50 -07:00
Jeff Morgan 41468cfed7 Bumping virtualbox 2014-09-03 21:02:31 -07:00