Commit Graph

26 Commits

Author SHA1 Message Date
Jeffrey Morgan
d3911ee5a3 Kitematic development version of windows
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-06-13 16:58:48 -07:00
Sean Li
4e79e67404 Merge branch 'master' into style-polish
Conflicts:
	src/components/ContainerHomeFolders.react.js
	src/components/Containers.react.js
	styles/right-panel.less
	styles/variables.less
2015-06-12 10:48:55 -07:00
Jeffrey Morgan
a12a90b765 Removed unncessary log statement & tabindex attribute 2015-06-11 15:07:58 -07:00
Sean Li
ccb1c5f214 Merge branch 'style-polish'
Conflicts:
	src/components/ContainerHomeFolders.react.js
	src/components/Containers.react.js
	styles/right-panel.less
	styles/variables.less
2015-06-11 14:48:25 -07:00
Sean Li
00cf90d871 Working buttons. 2015-06-10 17:42:14 -07:00
Jeffrey Morgan
7256065ca1 Minor bugfixes 2015-06-10 16:20:01 -07:00
Sean Li
c5f093f8cb JSHINT. 2015-06-10 11:12:47 -07:00
Sean Li
4ec9a4965a Fixing plus button. 2015-06-08 12:11:54 -07:00
Sean Li
b6fe85f7e6 Added new Kitematic icon set. 2015-06-05 17:44:49 -07:00
Jeffrey Morgan
2400b17c5a Merge branch 'master' into hub 2015-05-25 14:44:43 -07:00
Jeffrey Morgan
2065063b14 WIP login without refresh token 2015-05-22 16:59:07 -07:00
Sean Li
ca94af0437 Got rid of ContainerListNewItem. 2015-05-21 23:47:03 -07:00
Jeffrey Morgan
89cec26648 WIP login 2015-05-19 11:13:47 -07:00
Jeffrey Morgan
256c66e466 WIP hub 2015-05-17 14:19:20 -07:00
Jeffrey Morgan
32f129c5bd Error handling, updating state 2015-05-11 17:16:50 -07:00
Jeffrey Morgan
0e5ce4cc2e Last flux changes for containers 2015-05-10 16:42:57 -07:00
Jeffrey Morgan
7989d48253 All but environment variables working 2015-05-08 20:14:41 -07:00
Jeffrey Morgan
e6ec43f11b Merging 2015-04-29 19:36:51 -04:00
Jeffrey Morgan
2ed92d9d22 Fixing a few small button bugs 2015-04-27 12:34:58 -04:00
Jeffrey Morgan
e2b4261ac9 removing test url, console logs 2015-04-27 11:43:22 -04:00
Jeffrey Morgan
4199dc2e6a Merge branch 'master' into revert-382-revert-374-hub-button 2015-04-22 21:04:41 -04:00
Jeffrey Morgan
8daa24cbc4 Metrics => MetricsUtil 2015-04-21 21:26:42 -04:00
Jeffrey Morgan
532acc0611 Metrics => MetricsUtil 2015-04-21 21:18:46 -04:00
Jeffrey Morgan
5d1e866d25 Renaming metrics to MetricUtil 2015-04-21 21:14:28 -04:00
Jeffrey Morgan
d684428089 Moving Machine, VBox & Docker management utils to utils dir 2015-04-21 21:12:58 -04:00
Jeffrey Morgan
0a0cf3f64f Moving to a flux-like folder structure 2015-04-21 20:39:43 -04:00