Commit Graph

1895 Commits

Author SHA1 Message Date
Jeffrey Morgan 3294faa62e Merge branch 'master' of github.com:kitematic/kitematic
Conflicts:
	Gruntfile.js
2015-08-04 23:00:44 -07:00
Jeffrey Morgan dcd8f398dd Fix issues so Kitematic 0.8 works with Docker Toolbox 2015-08-04 21:27:46 -07:00
FrenchBen 4192c40813 Enhanced rules 2015-08-03 12:59:12 -04:00
FrenchBen bc1b6bff97 Added eslint pref 2015-08-03 11:27:35 -04:00
FrenchBen 43969f53f1 Added eslint pref 2015-08-03 11:27:28 -04:00
moxiegirl 2f792ce800 Merge pull request #878 from moxiegirl/877-updates-install
Update installation for Toolbox
2015-07-31 12:03:08 -07:00
Mary Anthony 6fc3f6f179 - Fixes #877 to update the install for toolbox
- Updates to the documentaiton infrasturture now can build entire public projects from kitematic
- Updates to the FAQ to make clear Windows is now supported

Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-30 10:52:13 -07:00
Jeffrey Morgan 4446bcf6c9 Merge branch 'master' of github.com:kitematic/kitematic 2015-07-29 15:33:49 -07:00
Jeffrey Morgan 619a4a7384 Fix missing babel task
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-29 15:33:40 -07:00
Jeffrey Morgan f8d89bc755 Bump to 0.8.0 rc3
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-29 15:30:45 -07:00
Jeffrey Morgan 40824e9838 On windows, use Docker in Quick Start
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-29 15:19:59 -07:00
Jeffrey Morgan abeea09c68 Merge pull request #832 from cclauss/patch-1
Correct the local directory path in Managing Volumes
2015-07-29 08:44:46 -07:00
Jeffrey Morgan 1cbd0619b9 Bump to 0.8.0-rc2 2015-07-28 14:51:16 -07:00
Jeffrey Morgan c4d89d3b80 Merge pull request #874 from FrenchBen/iso-fix
URGENT: Fixed iso and version issues
2015-07-28 14:26:52 -07:00
FrenchBen e58eba9646 Fixed iso and version issues
Signed-off-by: FrenchBen <me@frenchben.com>
2015-07-28 16:42:36 -04:00
Jeffrey Morgan 34ea0be9cc Bump to Docker to 1.8.0-rc1 2015-07-26 22:50:17 -07:00
Jeffrey Morgan 6e6b247221 Do not package boot2docker iso
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-26 22:36:43 -07:00
Jeffrey Morgan e64ebb207b Bump to Docker machine 0.4.0 RC
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-26 21:48:22 -07:00
Sean Li ced2df16f2 Polished about page. 2015-07-24 17:18:16 -07:00
Sean Li ee6e2997b4 Dropped image logo gradients. 2015-07-24 16:58:40 -07:00
Jeffrey Morgan 5eb90aaacd Revert terminal & compose version 2015-07-24 13:14:35 -07:00
Jeffrey Morgan dbc3f399dd Revert Gruntfile 2015-07-24 13:12:23 -07:00
Jeffrey Morgan 8445b13e9c Removing install cmd feature
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-24 13:07:38 -07:00
Jeffrey Morgan 4425210b23 Merge pull request #859 from kitematic/default-vm-name
Changing VM name to docker-dev
2015-07-24 11:44:49 -07:00
Michael Chiang 2bf509348f Text fix: Shut Down -> Shutdown
Reference: http://dictionary.reference.com/browse/shutdown?s=t
2015-07-23 10:43:09 -07:00
Michael Chiang 47cd30fdf9 Fix grammar - Search text 2015-07-23 10:41:00 -07:00
Jeffrey Morgan 298ed22c84 Changing VM name to docker-dev 2015-07-22 19:04:51 -07:00
Jeffrey Morgan bdf9b95906 Merge pull request #853 from TeckniX/allow-select
Added highlight for VM error
2015-07-22 18:57:01 -07:00
TeckniX 27dc94586b Added highlight for VM error
Signed-off-by: TeckniX <lokitek@gmail.com>
2015-07-22 21:32:42 -04:00
Li Shang 61f44bef2c Merge pull request #843 from TeckniX/about-versions
Added proper about page with tools versions
2015-07-22 13:33:33 -07:00
FrenchBen ec56336c4a Merge branch 'master' into about-versions 2015-07-22 13:22:50 -04:00
Jeffrey Morgan 26a91cefba Merge pull request #845 from tellel/patch-1
Fix volume data path on guide
2015-07-22 09:15:21 -07:00
FrenchBen 628b991947 Updated about look and feel to match design 2015-07-22 11:40:03 -04:00
tellel 1c9434eb99 fix volume data path
volume data path is `~/Documents/Kitematic/<container's name>/`
2015-07-22 15:04:26 +09:00
FrenchBen 26249ecaff Cleaned up menu 2015-07-20 18:44:07 -04:00
FrenchBen 07249eac6c Removed previous OSX about call 2015-07-20 18:43:14 -04:00
FrenchBen b8e795ab19 Added proper about page with tools versions
Signed-off-by: FrenchBen <me@frenchben.com>
2015-07-20 17:13:55 -04:00
Jeffrey Morgan 345fa9c26b Revert "Bump electron to 0.30.0"
This reverts commit fb7186a346.

Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-18 09:59:12 -07:00
Jeffrey Morgan fb7186a346 Bump electron to 0.30.0
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-18 11:26:32 -04:00
Jeffrey Morgan 796d2e1838 Bump Docker version to 1.7.1
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-18 11:07:02 -04:00
Jeffrey Morgan 7c55795582 Fix scrubbing windows user data
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-18 11:03:23 -04:00
Jeffrey Morgan 56c39c9c7f Fix update to tags API
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-18 10:57:09 -04:00
cclauss c2a4bedeb3 Reversed order of Documents and Kitematic in path
You are correct.  Thanks for catching my mistake.
2015-07-17 19:31:37 +02:00
cclauss 5827b06558 Correct the local directory path in Managing Volumes
Added Documents/ to path.  This should close issue https://github.com/kitematic/kitematic/issues/830

Signed-off-by: Christian Clauss cclauss@bluewin.ch
2015-07-17 15:29:30 +02:00
Jeffrey Morgan ae7535723d Bump machine to 0.3.1 rc1
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-15 15:14:48 -07:00
Jeffrey Morgan 396074d235 Revert "Temporary bump of docker-machine"
This reverts commit 23010796e6.
2015-07-15 14:49:39 -07:00
Jeffrey Morgan 23010796e6 Temporary bump of docker-machine
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-15 14:45:29 -07:00
Jeffrey Morgan d29b44f052 Merge branch 'master' of github.com:kitematic/kitematic 2015-07-15 13:41:01 -07:00
Jeffrey Morgan 83dbcff97c Bump to 0.7.5
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-15 13:40:53 -07:00
Jeffrey Morgan 81326fe8ad Merge pull request #820 from kitematic/fix-vbox-5
Fixed issues with Virtualbox 5
2015-07-15 13:40:24 -07:00