Commit Graph

80 Commits

Author SHA1 Message Date
Sean Li f2467f59a4 Disabled download scrolling. 2015-07-21 15:42:52 -07:00
Jeffrey Morgan 04124d82a9 Change download links 2015-07-15 19:10:30 -07:00
Jeffrey Morgan 0c2f4284f1 Change download links 2015-07-15 16:31:38 -07:00
Jeffrey Morgan 8e46236302 Merge branch 'master' of github.com:docker/toolbox 2015-07-15 15:32:28 -07:00
Jeffrey Morgan 1867d9ea9b bump versions 2015-07-15 15:32:21 -07:00
Jeffrey Morgan 011ce79fa1 Bump virtualbox and Kitematic
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-15 15:31:08 -07:00
Jeffrey Morgan fd5474a954 Merge branch 'master' of github.com:docker/toolbox 2015-07-15 15:29:29 -07:00
Jeffrey Morgan 3fbbf8b46b Fix icons & start script 2015-07-15 15:29:21 -07:00
Jeffrey Morgan e8bc24e37c Bump for 1.7.1
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-15 15:28:31 -07:00
Jeffrey Morgan ac34c4489d Merge branch 'master' of github.com:docker/toolbox 2015-07-15 14:11:20 -07:00
Jeffrey Morgan 8766c7fd7d Ask users before removing vms
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-15 14:11:14 -07:00
Jeffrey Morgan 85566975ba No error on signing fail
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-07-15 14:10:25 -07:00
Jeffrey Morgan 9c396bc112 Update README.md 2015-07-14 23:05:43 -07:00
Jeffrey Morgan 766da7f8d8 Remove makedmg 2015-07-14 23:01:17 -07:00
Jeffrey Morgan 313c825a08 Add content to the README.md 2015-07-14 22:36:07 -07:00
Jeffrey Morgan 027d0f4b9d port delete script 2015-07-14 16:42:29 -07:00
Jeffrey Morgan 423dd80fe2 Update README.md 2015-07-14 16:26:19 -07:00
Jeffrey Morgan c78011622b Update README.md 2015-07-14 16:24:34 -07:00
Jeffrey Morgan a16b5bbb15 Update README.md 2015-07-14 16:23:06 -07:00
Jeffrey Morgan fcbbbce415 Update README.md 2015-07-14 16:21:18 -07:00
Jeffrey Morgan 2c67051d48 Update README.md 2015-07-14 16:18:44 -07:00
Michael Chiang 7d7bdb7728 Fix Toolbox welcome.html. Not engine but client.
Engine -> Client
2015-07-14 12:26:22 -07:00
Michael Chiang 616181b6f8 OSX Readme.MD change - removing boot2docker references
OSX Readme.MD change - removing boot2docker references
2015-07-14 12:26:22 -07:00
Michael Chiang be5f0dee61 Fix version name ENV
Fix version name ENV
2015-07-14 12:26:22 -07:00
Jeffrey Morgan 2137536624 Merge branch 'master' of github.com:docker/toolbox 2015-07-14 12:12:15 -07:00
Jeffrey Morgan 36208ddefb Remove unnecessary restart task at end of install 2015-07-14 12:12:09 -07:00
Jeffrey Morgan 24c1d3084e t pMerge branch 'master' of github.com:docker/toolbox 2015-07-14 12:03:35 -07:00
Jeffrey Morgan f39bcde25b Add Docs 2015-07-14 12:02:37 -07:00
Jeffrey Morgan a9a1a50124 Merge branch 'master' of github.com:docker/toolbox 2015-07-14 12:02:33 -07:00
Jeffrey Morgan e6ee48a88f Add docs 2015-07-14 12:02:30 -07:00
Jeffrey Morgan 6f9751d618 Fix windows start script 2015-07-14 12:00:51 -07:00
Sean Li 2940c98332 Uses dev instead of docker-vm. 2015-07-14 11:50:10 -07:00
Sean Li 90317c762d Merge remote-tracking branch 'origin/master' 2015-07-14 11:48:31 -07:00
Sean Li 8f8e385daf Merge remote-tracking branch 'origin/master'
Conflicts:
	site/static/css/main.css
	site/static/less/layout.less
2015-07-14 11:48:29 -07:00
Jeffrey Morgan 7291c75daa Fix env loading on mac os x 2015-07-14 11:46:58 -07:00
Sean Li 75ee11b1c9 Deleted Swarm and centered included items. 2015-07-14 11:44:32 -07:00
Jeffrey Morgan b16944d30e Fix broken custom install location button 2015-07-14 00:38:29 -07:00
Jeffrey Morgan dd0c4fd3c2 Fix wording & centering 2015-07-14 00:17:12 -07:00
Jeffrey Morgan 10ecaa6f6e Merge branch 'master' of github.com:docker/toolbox 2015-07-14 00:11:06 -07:00
Jeffrey Morgan 9c45387256 Fix bash startup script on mac 2015-07-14 00:10:36 -07:00
Jeffrey Morgan ce6cecc080 Merge branch 'master' of github.com:docker/toolbox 2015-07-13 17:29:46 -07:00
Jeffrey Morgan 0bec920046 set -e on windows 2015-07-13 17:29:35 -07:00
Michael Chiang efd6e4dfa8 Adding Kitematic to the install info.
- Adding KM
2015-07-13 16:53:52 -07:00
Jeffrey Morgan 65d6b97b82 Stop on error on Mac OS X 2015-07-13 16:25:10 -07:00
Jeffrey Morgan 45540619f5 Create VERSION 2015-07-13 16:13:13 -07:00
Jeffrey Morgan 2b9790f062 Updated download link 2015-07-13 16:12:29 -07:00
Jeffrey Morgan 74bdf8cd53 Merge branch 'master' of github.com:docker/toolbox 2015-07-13 16:07:38 -07:00
Jeffrey Morgan 3a9ad9f478 Proper signing 2015-07-13 16:06:54 -07:00
Sean Li 35675727bf Fixed copyright icon. 2015-07-13 11:57:29 -07:00
Sean Li da43f8087d Styled ordered list. 2015-07-13 10:44:45 -07:00