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

1149 Commits

Author SHA1 Message Date
Jeffrey Morgan 42417c3523 traffic lights 2015-01-13 16:45:18 -05:00
Jeffrey Morgan 6bdfdb0b12 Merge branch 'master' of github.com:kitematic/kitematic into jmorgan_react_refactor 
Conflicts:
	meteor/client/lib/apputil.js
	meteor/client/lib/docker.js
	meteor/client/lib/imageutil.js
	meteor/client/lib/metrics.js
	meteor/client/lib/startup.js
	meteor/client/lib/util.js
	meteor/client/main.js
 2015-01-12 09:36:50 -05:00
Jeffrey Morgan 4c3d3ad08b Merge branch 'master' of github.com:kitematic/kitematic into jmorgan_react_refactor 
Conflicts:
	meteor/client/lib/apputil.js
	meteor/client/lib/docker.js
	meteor/client/lib/imageutil.js
	meteor/client/lib/metrics.js
	meteor/client/lib/startup.js
	meteor/client/lib/util.js
	meteor/client/main.js
 2015-01-12 09:36:50 -05:00
Jeffrey Morgan b7b725cbca Merge branch 'master' into jmorgan_react_refactor 2015-01-12 09:36:11 -05:00
Jeffrey Morgan f7087e4e6b Merge branch 'master' into jmorgan_react_refactor 2015-01-12 09:36:11 -05:00
Jeffrey Morgan 5f06cb9ad3 Ported kitematic setup 2015-01-12 09:28:29 -05:00
Jeffrey Morgan 13cd6ed0b4 Ported kitematic setup 2015-01-12 09:28:29 -05:00
Jeffrey Morgan 5c98a92b4f Merge pull request #152 from kitematic/jmorgan_fix_metrics_images 
Fix metrics & hide images with <none>:<none> tag
 2015-01-06 16:16:28 -08:00
Jeffrey Morgan ad8cfbe5a1 Merge pull request #152 from kitematic/jmorgan_fix_metrics_images 
Fix metrics & hide images with <none>:<none> tag
 2015-01-06 16:16:28 -08:00
Jeffrey Morgan 4f89f44809 Fixing random containers created 2015-01-06 16:15:53 -08:00
Jeffrey Morgan eaaf813ac1 Fixing random containers created 2015-01-06 16:15:53 -08:00
Jeffrey Morgan 1e8a83364d fixing metrics 2015-01-06 15:20:09 -08:00
Jeffrey Morgan 553b0773c8 fixing metrics 2015-01-06 15:20:09 -08:00
Jeffrey Morgan 7e36b8c6c1 bump version 2015-01-06 15:13:15 -08:00
Jeffrey Morgan a4c085a361 bump version 2015-01-06 15:13:15 -08:00
Jeffrey Morgan 559e6f616e Fix metrics and untagged images 2015-01-06 15:13:01 -08:00
Jeffrey Morgan 34fd6aaebb Fix metrics and untagged images 2015-01-06 15:13:01 -08:00
Jeffrey Morgan 592754fad0 Adding livereload, react-router base 2014-12-30 18:01:27 -05:00
Jeffrey Morgan be51f26065 Adding livereload, react-router base 2014-12-30 18:01:27 -05:00
Jeffrey Morgan 424bccc3a9 Node & test environment 
- Fix environment to require no node install and more straightforward
- Add jasmine files
 2014-12-27 16:32:52 -05:00
Jeffrey Morgan 01e3521f92 Node & test environment 
- Fix environment to require no node install and more straightforward
- Add jasmine files
 2014-12-27 16:32:52 -05:00
Jeff Morgan cbe538ae54 Basic asset pipeline for atom-shell based development & release 2014-12-21 00:08:50 -05:00
Jeff Morgan 70fb66297b Basic asset pipeline for atom-shell based development & release 2014-12-21 00:08:50 -05:00
Jeffrey Morgan 8fae3b2ddf Merge pull request #141 from kitematic/jmorgan_bump_0.4.3 
Bumping version to 0.4.3
 2014-12-19 10:50:51 -08:00
Jeffrey Morgan 593e793f0c Merge pull request #141 from kitematic/jmorgan_bump_0.4.3 
Bumping version to 0.4.3
 2014-12-19 10:50:51 -08:00
Jeff Morgan 4722ce6445 Merge branch 'master' into jmorgan_bump_0.4.3 2014-12-16 07:21:37 -08:00
Jeff Morgan e8696d7fd5 Merge branch 'master' into jmorgan_bump_0.4.3 2014-12-16 07:21:37 -08:00
Jeffrey Morgan 1655ddc70c Merge pull request #142 from kitematic/jmorgan_fix_image_tags 
Fixing image tag ordering and rendering
 2014-12-15 22:03:29 -08:00
Jeffrey Morgan 386b8bbc2c Merge pull request #142 from kitematic/jmorgan_fix_image_tags 
Fixing image tag ordering and rendering
 2014-12-15 22:03:29 -08:00
Jeff Morgan 9472dd4dcc Fixing image tag ordering and rendering 2014-12-15 22:01:29 -08:00
Jeff Morgan 44ed5d9479 Fixing image tag ordering and rendering 2014-12-15 22:01:29 -08:00
Jeff Morgan dd558f6a94 bumping version 2014-12-14 22:49:28 -08:00
Jeff Morgan 630d233799 bumping version 2014-12-14 22:49:28 -08:00
Jeffrey Morgan 14f1f527d1 Merge pull request #140 from kitematic/jmorgan_fix_terminal_spaces 
Fix bug where terminal button fails if spaces in Kitematic.app path
 2014-12-14 22:42:16 -08:00
Jeffrey Morgan 4754fc82b4 Merge pull request #140 from kitematic/jmorgan_fix_terminal_spaces 
Fix bug where terminal button fails if spaces in Kitematic.app path
 2014-12-14 22:42:16 -08:00
Jeff Morgan b7b212305e Fix bug where terminal button fails if spaces in Kitematic.app path 2014-12-14 22:41:06 -08:00
Jeff Morgan 88cf79569a Fix bug where terminal button fails if spaces in Kitematic.app path 2014-12-14 22:41:06 -08:00
Jeffrey Morgan aaf42470ab Merge pull request #139 from kitematic/jmorgan_fix_app_image_sync 
Fixing bugs that occur with sync when containers fail to run
 2014-12-14 21:04:21 -08:00
Jeffrey Morgan 9a92f1cf35 Merge pull request #139 from kitematic/jmorgan_fix_app_image_sync 
Fixing bugs that occur with sync when containers fail to run
 2014-12-14 21:04:21 -08:00
Jeff Morgan 9ea3245b57 Fixing bugs that occur with sync when containers fail to run 2014-12-14 21:03:08 -08:00
Jeff Morgan 6ce5da9a78 Fixing bugs that occur with sync when containers fail to run 2014-12-14 21:03:08 -08:00
Jeff Morgan 7a124ad353 Dont track node license 2014-12-11 22:14:21 -08:00
Jeff Morgan 95d61cb7bb Dont track node license 2014-12-11 22:14:21 -08:00
Jeff Morgan b6bf57ca6d fixing names 2014-12-10 19:21:54 -08:00
Jeff Morgan 641bc309ad fixing names 2014-12-10 19:21:54 -08:00
Jeff Morgan 9b3f3e64cc removing log print 2014-12-10 19:13:58 -08:00
Jeff Morgan aaa6d6d921 removing log print 2014-12-10 19:13:58 -08:00
Jeffrey Morgan c30a0ffa6f Merge pull request #136 from kitematic/jmorgan_bump_v0.4.2 
Bump 0.4.2
 2014-12-10 19:00:03 -08:00
Jeffrey Morgan 99a27bd398 Merge pull request #136 from kitematic/jmorgan_bump_v0.4.2 
Bump 0.4.2
 2014-12-10 19:00:03 -08:00
Jeffrey Morgan 0d3846b6fc Merge pull request #135 from kitematic/jmorgan_fix_metrics 
Change localstore data to leveldb
 2014-12-10 18:56:22 -08:00