1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

184 Commits

Author SHA1 Message Date
Sean Li
a5dddeca96 Fixed bug with GA not tracking. 2014-09-11 00:24:12 -07:00
Sean Li
80b57e6e61 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
e3e1380ffa 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
57c7ec5355 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
3476b0031a 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
Jeff Morgan
93123e447b 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
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
4433b91982 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
7611e24321 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
22b1c3f873 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
Jeff Morgan
a2b6d62420 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
cab775f9c2 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
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
Sean Li
aba0b291bc Added start/stop action in app detail page. 2014-09-06 20:47:24 -07:00
Sean Li
06c522d4f2 UX refactor and JSHint. 2014-09-06 20:44:45 -07:00
Sean Li
fef4a8cc37 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
b1065cb8b1 Removed octicons package. 2014-09-06 01:04:27 -07:00
Sean Li
e1f1f41efb 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
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