Commit Graph

1068 Commits

Author SHA1 Message Date
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
Sean Li ae665d4a44 Changed wording. 2015-02-09 09:37:25 -08:00
Sean Li a0e2f55bae Changed wording. 2015-02-09 09:37:25 -08:00
Sean Li 41e2d08d65 Changed preview back to run. 2015-02-06 16:31:38 -08:00
Sean Li b435ebad9b Changed preview back to run. 2015-02-06 16:31:38 -08:00
Sean Li 0addb8e880 Adjusted margins. 2015-02-06 15:28:28 -08:00
Sean Li 6398370cdd Adjusted margins. 2015-02-06 15:28:28 -08:00
Kitematic 47ac7512a4 Change run to preview.
To reduce the chance of users thinking the run button is to run the
container.
2015-02-06 18:10:59 -05:00
Kitematic f084f01f8c Change run to preview.
To reduce the chance of users thinking the run button is to run the
container.
2015-02-06 18:10:59 -05:00
Sean Li a73951e6cb Traffic light restyling. 2015-02-06 13:58:47 -08:00
Sean Li 7a80890880 Traffic light restyling. 2015-02-06 13:58:47 -08:00
Sean Li f9e6fd40b6 Fixed a SSL image error. 2015-02-06 10:54:33 -08:00
Sean Li e3fa3b75fc Fixed a SSL image error. 2015-02-06 10:54:33 -08:00
Jeffrey Morgan b505f0919d Fix release 2015-02-06 12:38:51 -05:00
Jeffrey Morgan 42ac58f939 Fix release 2015-02-06 12:38:51 -05:00
Jeffrey Morgan 210582e14c ui tweaks 2015-02-06 12:33:01 -05:00
Jeffrey Morgan 9d05d5acc2 ui tweaks 2015-02-06 12:33:01 -05:00
Jeffrey Morgan 925223a472 add loading after button press 2015-02-06 12:14:38 -05:00
Jeffrey Morgan c1a442223b add loading after button press 2015-02-06 12:14:38 -05:00
Jeffrey Morgan 24f8062f06 Merge branch 'jmorgan-merge-restyle' of github.com:kitematic/kitematic into jmorgan-merge-restyle
Conflicts:
	src/ContainerDetails.react.js
2015-02-06 12:09:04 -05:00
Jeffrey Morgan 4ddfc22245 Merge branch 'jmorgan-merge-restyle' of github.com:kitematic/kitematic into jmorgan-merge-restyle
Conflicts:
	src/ContainerDetails.react.js
2015-02-06 12:09:04 -05:00
Jeffrey Morgan 30fb489edd Better spinners 2015-02-06 12:08:42 -05:00
Jeffrey Morgan cb9a1b4f7f Better spinners 2015-02-06 12:08:42 -05:00
Sean Li 8c66ff9b79 Added KI logo. 2015-02-05 22:07:26 -08:00
Sean Li 37d8801f4f Added KI logo. 2015-02-05 22:07:26 -08:00
Sean Li 459ca9c6e5 Restyle. 2015-02-05 21:55:47 -08:00
Sean Li e7f3a55933 Restyle. 2015-02-05 21:55:47 -08:00