Commit Graph

2137 Commits

Author SHA1 Message Date
Jeff Morgan e58f35e4d6 Fixing breaking bug if old version of virtualbox is installed. 2014-09-12 02:12:20 -07:00
Michael Chiang 9c5c36c80c white screen issue. 2014-09-11 20:50:10 -07:00
Michael Chiang 6f77c8aaa2 white screen issue. 2014-09-11 20:50:10 -07:00
Michael Chiang 06a3a12cde staying current with v0.2.1 release. 2014-09-11 19:17:26 -07:00
Michael Chiang bc2e8d616c staying current with v0.2.1 release. 2014-09-11 19:17:26 -07:00
Jeff Morgan 2eab2374dc virtualbox check 2014-09-11 17:06:45 -07:00
Jeff Morgan 4ff3567a58 virtualbox check 2014-09-11 17:06:45 -07:00
Jeff Morgan 388e7a0dc5 Fixing remaining bugs. 2014-09-11 16:16:19 -07:00
Jeff Morgan 18aefe39a6 Fixing remaining bugs. 2014-09-11 16:16:19 -07:00
Jeff Morgan 9619b22dd7 Adding CFBundleName for script 2014-09-11 15:45:54 -07:00
Jeff Morgan b95a2adb1e Adding CFBundleName for script 2014-09-11 15:45:54 -07:00
Jeff Morgan 373dfeb4e9 Bump version 2014-09-11 15:42:42 -07:00
Jeff Morgan 785907daf9 Bump version 2014-09-11 15:42:42 -07:00
Sean Li c76ac562f8 Fixed a bug where creating image without volume hangs. 2014-09-11 15:34:25 -07:00
Sean Li c087a77501 Fixed a bug where creating image without volume hangs. 2014-09-11 15:34:25 -07:00
Sean Li c4d103574d Fixed bug with copying folder. 2014-09-11 15:05:57 -07:00
Sean Li 0b0a50e403 Fixed bug with copying folder. 2014-09-11 15:05:57 -07:00
Peter deHaan 194220b9bb Updating package.json
Should now pass http://package-json-validator.com/ with minimal warnings:
```json
{
  "valid": true,
  "warnings": [
    "Missing recommended field: keywords",
    "Missing recommended field: contributors"
  ],
  "recommendations": [
    "Missing optional field: engines"
  ]
}
```
2014-09-11 10:59:06 -07:00
Peter deHaan 6204762db4 Updating package.json
Should now pass http://package-json-validator.com/ with minimal warnings:
```json
{
  "valid": true,
  "warnings": [
    "Missing recommended field: keywords",
    "Missing recommended field: contributors"
  ],
  "recommendations": [
    "Missing optional field: engines"
  ]
}
```
2014-09-11 10:59:06 -07:00
Sean Li e386f39451 Merge branch 'master' of https://github.com/kitematic/kitematic 2014-09-11 00:24: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 40a2a6c7d9 Merge branch 'rc0.2.0' 2014-09-11 00:24:30 -07:00
Sean Li d2820cb6e8 Merge branch 'rc0.2.0' 2014-09-11 00:24:30 -07:00
Sean Li a5dddeca96 Fixed bug with GA not tracking. 2014-09-11 00:24:12 -07:00
Sean Li a4ac441674 Fixed bug with GA not tracking. 2014-09-11 00:24:12 -07:00
Sean Li cf4917e8a0 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 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 80b57e6e61 JSHint. 2014-09-10 23:50:12 -07:00
Sean Li e6f1e50bc5 JSHint. 2014-09-10 23:50:12 -07:00
Jeff Morgan 337c92cd5e Merge branch 'rc0.2.0' of github.com:kitematic/kitematic into rc0.2.0 2014-09-10 23:43:20 -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 e3e1380ffa Fixing boot2docker call in removeBindFolder 2014-09-10 23:42:59 -07:00
Jeff Morgan 51658b92d9 Fixing boot2docker call in removeBindFolder 2014-09-10 23:42:59 -07:00
Sean Li aa99fd0f99 Fixed app not deleting and form validation not working bug. 2014-09-10 23:41:17 -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 57c7ec5355 Window options to allow loading local files. 2014-09-10 23:31:54 -07:00
Sean Li 492efafb09 Window options to allow loading local files. 2014-09-10 23:31:54 -07:00
Jeff Morgan fff85a1d94 Merge branch 'rc0.2.0' of github.com:kitematic/kitematic into rc0.2.0 2014-09-10 23:21:11 -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 3476b0031a Removing old versions script 2014-09-10 23:20:38 -07:00
Jeff Morgan 5ecc814eb2 Removing old versions script 2014-09-10 23:20:38 -07:00
Sean Li bae30c6e4a Fixed tracking not being applied. 2014-09-10 23:18:29 -07:00
Sean Li b3ddb9f607 Fixed tracking not being applied. 2014-09-10 23:18:29 -07:00
Jeff Morgan 93123e447b Specific verison of boot2docker 2014-09-10 23:17:19 -07:00
Jeff Morgan abf17dbcff Specific verison of boot2docker 2014-09-10 23:17:19 -07:00
Jeff Morgan 691b766ec5 Fixing HEAD in index.js 2014-09-10 23:03:44 -07:00
Jeff Morgan c5b7e2ae6c 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 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 4433b91982 Reverting atom-shell native meteor require changes 2014-09-10 22:07:23 -07:00