docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,215 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

1215 Commits

Author SHA1 Message Date
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
Jeff Morgan 98c2de58b3 Reverting atom-shell native meteor require changes 2014-09-10 22:07:23 -07:00
Jeff Morgan 7d2449e611 fixing route daemon 2014-09-10 21:51:42 -07:00
Jeff Morgan f691f95beb fixing route daemon 2014-09-10 21:51:42 -07:00
Jeff Morgan 7611e24321 Fixing bug where reboot would cause view clicks to fail 2014-09-10 20:29:53 -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 07a71c16a9 Merge branch 'rc0.2.0' of github.com:kitematic/kitematic into rc0.2.0 2014-09-10 19:39:40 -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 22b1c3f873 Adding setup page for usage diagnostics 2014-09-10 19:39:25 -07:00
Jeff Morgan 59e14fb883 Adding setup page for usage diagnostics 2014-09-10 19:39:25 -07:00
Sean Li 252f7ad5e3 Cleaned package gitignore. 2014-09-10 11:56:28 -07:00
Sean Li f006c36be6 Cleaned package gitignore. 2014-09-10 11:56:28 -07:00
Jeff Morgan a2b6d62420 Fixing mainWindow undefined error 2014-09-09 17:03:02 -07:00
Jeff Morgan c1907be3d2 Fixing mainWindow undefined error 2014-09-09 17:03:02 -07:00
Jeff Morgan 5e7205b326 removing vbox and base images files 2014-09-09 16:25:58 -07:00
Jeff Morgan e398e44245 removing vbox and base images files 2014-09-09 16:25:58 -07:00
Jeff Morgan cab775f9c2 Progress for default images and vbox 2014-09-09 16:23:48 -07:00
Jeff Morgan 3a88f78a55 Progress for default images and vbox 2014-09-09 16:23:48 -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 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 a03f482d56 Fixed starting/stopping apps locking up issue. 2014-09-07 14:52:44 -07:00