Commit Graph

1144 Commits

Author SHA1 Message Date
Jeffrey Morgan fa75c1a93c Reverting containerstore 2015-02-15 17:19:30 -08:00
Jeffrey Morgan 02e0cb1dbb Adding manual test guide 2015-02-15 17:17:38 -08:00
Jeffrey Morgan 1445c62ed1 Setup fixes & unit tests 2015-02-15 16:54:21 -08:00
Sean Li d51d34ff0c Fixed image not updating during installer. 2015-02-13 13:42:44 -08:00
Sean Li 318930d8a0 Installer patch and updated package.json 2015-02-13 11:53:44 -08:00
Sean Li 99ae10ef1f Merge branch 'master' into sean-polish 2015-02-13 11:26:43 -08:00
Sean Li f9f2dc6191 More informative error message. 2015-02-13 11:26:28 -08:00
Jeffrey Morgan 2c587445e9 Removing error if vmdestroy is called without VirtualBox 2015-02-13 11:26:11 -08:00
Sean Li 913658fcdd Navigation polish. 2015-02-13 11:16:13 -08:00
Jeffrey Morgan 9b5b70f562 Merge 2015-02-13 10:44:09 -08:00
Jeffrey Morgan c338678094 Merge remote-tracking branch 'origin/sean-polish'
Conflicts:
src/Radial.react.js
src/Setup.react.js
styles/radial.less
2015-02-13 10:44:00 -08:00
Jeffrey Morgan e8f87e1ebe Merge pull request #177 from kitematic/setup-cancel
Install docker and boot2docker with Kitematic
2015-02-13 10:36:14 -08:00
Jeffrey Morgan 4e3190c42c Cache dependencies 2015-02-13 10:28:23 -08:00
Jeffrey Morgan bb3e6e6e1b Fix tests 2015-02-13 10:25:27 -08:00
Jeffrey Morgan 205a12041f removing unused requires 2015-02-13 10:03:23 -08:00
Jeffrey Morgan f3d719756b Fixing menu, adding Docker terminal 2015-02-13 00:03:25 -08:00
Jeffrey Morgan dc469af25c Install docker & boot2docker binaries with Kitematic 2015-02-12 22:51:26 -08:00
Jeffrey Morgan 3f4c26429b Merge pull request #176 from kitematic/setup-cancel
Change re-run to retry in setup
2015-02-12 11:00:28 -08:00
Jeffrey Morgan b32f0b20c5 Change re-run to retry setup 2015-02-12 11:00:01 -08:00
Jeffrey Morgan f80cda4e0d Merge pull request #175 from kitematic/setup-cancel
Adding setup retry when user cancels virtualbox install
2015-02-12 09:35:16 -08:00
Jeffrey Morgan 98c6e0fda5 Adding setup retry when user cancels virtualbox install 2015-02-12 09:25:00 -08:00
Jeffrey Morgan 54e105e3fd Merge pull request #174 from kitematic/jmorgan-settings-fix
Fixing settings, testing SetupStore
2015-02-11 15:43:30 -08:00
Jeffrey Morgan da2da138b6 Merge branch 'master' into jmorgan-settings-fix 2015-02-11 15:43:04 -08:00
Jeffrey Morgan 529f22eded Merge branch 'master' of github.com:kitematic/kitematic 2015-02-11 15:42:52 -08:00
Jeffrey Morgan 8f481bdc0e Update README.md 2015-02-11 15:39:33 -08:00
Jeffrey Morgan 847b4c7cba Fixing VirtualBox case 2015-02-11 15:36:55 -08:00
Jeffrey Morgan 343332e4c6 Adding it back 2015-02-11 15:24:45 -08:00
Jeffrey Morgan e6ea5024b7 Temporary removal of VirtualBox 2015-02-11 15:24:29 -08:00
Jeffrey Morgan a8a490ea70 Reverting to 1.4.1 for now 2015-02-11 15:10:12 -08:00
Jeffrey Morgan 621b0503ab Adding Setup tests and settings fix 2015-02-11 15:09:17 -08:00
Jeffrey Morgan 67569bead1 Removing integration tests section of read 2015-02-10 08:37:18 -08:00
Jeffrey Morgan bc6cb29f81 removing settings 2015-02-10 08:28:23 -08:00
Jeffrey Morgan b8b107f4d2 removing settings 2015-02-10 08:28:23 -08:00
Jeffrey Morgan e9fbf9d44a Merge branch t pu'master' of github.com:kitematic/kitematic 2015-02-10 08:26:50 -08:00
Jeffrey Morgan 36b475824f Merge branch t pu'master' of github.com:kitematic/kitematic 2015-02-10 08:26:50 -08:00
Jeffrey Morgan 04337044b8 Merge branch 'master' of github.com:kitematic/kitematic 2015-02-09 21:36:33 -08:00
Jeffrey Morgan b0abba534e Merge branch 'master' of github.com:kitematic/kitematic 2015-02-09 21:36:33 -08:00
Jeffrey Morgan fd2dfb7e51 Merge branch 'master' of github.com:kitematic/kitematic 2015-02-09 21:36:33 -08:00
Jeffrey Morgan a5ec746bc4 adding hipchat room 2015-02-09 21:36:27 -08:00
Jeffrey Morgan dc30745ba7 adding hipchat room 2015-02-09 21:36:27 -08:00
Jeffrey Morgan 2f518f5d46 Create .travis.yml 2015-02-09 21:29:40 -08:00
Jeffrey Morgan 6b4f6cf53f Create .travis.yml 2015-02-09 21:29:40 -08:00
Jeffrey Morgan ed04bdb699 Update README.md 2015-02-09 21:27:09 -08:00
Jeffrey Morgan 5da63c8134 Update README.md 2015-02-09 21:27:09 -08:00
Jeffrey Morgan a8739d3341 Merge pull request #173 from kitematic/jmorgan-merge-restyle
Merge style & unit tests
2015-02-09 21:25:34 -08:00
Jeffrey Morgan c37f2e4985 Merge pull request #173 from kitematic/jmorgan-merge-restyle
Merge style & unit tests
2015-02-09 21:25:34 -08:00
Jeffrey Morgan cb437f1d89 Merging 2015-02-09 21:24:12 -08:00
Jeffrey Morgan e0f4049c82 Merging 2015-02-09 21:24:12 -08:00
Sean Li 60fa865bc6 Polished installation steps. 2015-02-09 15:29:04 -08:00
Sean Li 863aad918a Polished installation steps. 2015-02-09 15:29:04 -08:00