12 Commits

Author	SHA1	Message	Date
ttwthomas	da5bccf870	fix issue 268 ... https://github.com/kitematic/kitematic/issues/268	2015-03-17 11:25:43 -04:00
Jeffrey Morgan	d7cd96f593	Fix minor bugs ... - Restart now keeps the same port - Terminal into container no longer depends on active machine	2015-03-02 20:17:53 -05:00
Jeffrey Morgan	1802f72564	Better setup debugging	2015-03-02 00:57:02 -05:00
Jeffrey Morgan	d52810959a	Fixing merges	2015-02-26 20:16:48 -05:00
Jeffrey Morgan	75467305df	Merge branch 'master' into machine ... Conflicts: util/deps	2015-02-26 20:15:01 -05:00
Jeffrey Morgan	b5bd6803d6	Working version of machine	2015-02-26 20:14:43 -05:00
Sean Li	32aa1ad59d	Fixed issue with clickable areas with icon buttons.	2015-02-26 16:43:51 -08:00
Jeffrey Morgan	25302cc1a9	Merge branch 'master' into machine ... Conflicts: util/deps	2015-02-26 16:18:26 -05:00
Sean Li	de9d74e8dc	Refactored and added web ports.	2015-02-26 12:02:13 -08:00
Sean Li	8e0a9deaa4	Icon change to avoid confusion.	2015-02-26 11:44:49 -08:00
Jeffrey Morgan	e7aaeeaf21	Adding metrics	2015-02-20 15:09:25 -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