Commit Graph

983 Commits

Author SHA1 Message Date
Jeffrey Morgan 2345bf7d89 Fix upgrading virtual box if existing boot2docker vm is running 2015-02-23 15:38:31 -05:00
Jeffrey Morgan 68338dd414 Merge pull request #197 from kitematic/fix-downloading
Fix downloading
2015-02-23 14:15:18 -05:00
Jeffrey Morgan 5424cced8b Merge branch 'master' into disable-backspace 2015-02-23 14:12:56 -05:00
Jeffrey Morgan 04a41e7492 Fix deleting downloading container, fix showing blocked container even though it is downloading fine 2015-02-23 14:12:48 -05:00
Sean Li 6c38bf7347 Changed slight wording. 2015-02-23 09:42:40 -08:00
Jeffrey Morgan 6942d6790e Merge pull request #196 from kitematic/disable-backspace
Disable backspace
2015-02-23 11:46:44 -05:00
Jeffrey Morgan a29ba109a9 Disable backspace 2015-02-23 11:43:27 -05:00
Jeffrey Morgan a6d75823d2 Merge pull request #195 from kitematic/pulling-dependent-layers
Show 'waiting for another image' when blocked on pulling dependent layers
2015-02-22 23:39:24 -05:00
Jeffrey Morgan ea3daeda02 Show 'waiting for another image' when blocked on pulling dependent layers 2015-02-22 23:34:53 -05:00
Jeffrey Morgan 4d57198e93 Bugfixes & scrub bug reports 2015-02-22 19:44:17 -05:00
Jeffrey Morgan d82560c313 Merge pull request #194 from kitematic/metrics
Adding metrics
2015-02-20 15:36:35 -08:00
Jeffrey Morgan 72b8d6cc81 Fixing merge 2015-02-20 15:33:26 -08:00
Jeffrey Morgan 15328fa260 Merge branch 'master' into metrics
Conflicts:
	src/ImageCard.react.js
2015-02-20 15:32:18 -08:00
Jeffrey Morgan abc3f05cb5 Fix tests 2015-02-20 15:29:19 -08:00
Jeffrey Morgan e7aaeeaf21 Adding metrics 2015-02-20 15:09:25 -08:00
Sean Li 791b4c99b5 Fixed tab color. 2015-02-20 14:39:13 -08:00
Sean Li 9735182e43 Restyled image card tag icon. 2015-02-20 14:20:02 -08:00
Sean Li 65195bcc33 Will now redirect if developing locally. 2015-02-20 14:16:42 -08:00
Sean Li 968e09ab12 Container list item tweak. 2015-02-20 14:07:57 -08:00
Sean Li 8eccec8958 Prevent dragging in files from redirecting. 2015-02-20 13:47:24 -08:00
Sean Li 22933a2195 Minor CSS tweak for image cards. 2015-02-20 13:15:40 -08:00
Sean Li 9c60929ff8 Merge pull request #193 from kitematic/tooltips
Re-designed image catalog and added tooltips
2015-02-20 11:57:05 -08:00
Sean Li 3adc1bbee6 Minor CSS tweak. 2015-02-20 11:53:01 -08:00
Sean Li 7f068c1806 Spacing tweak. 2015-02-20 11:48:26 -08:00
Sean Li 3d71a3b387 Image card name fix. 2015-02-20 11:47:44 -08:00
Sean Li 61289f706c Tooltips and redesigned image cards. 2015-02-20 11:21:29 -08:00
Sean Li 1c2c597c87 Merge pull request #192 from kitematic/refactor-css
Refactored LESS into smaller files
2015-02-20 09:45:09 -08:00
Sean Li f3fe8b1bf9 LESS refactoring. 2015-02-19 16:19:37 -08:00
Sean Li 2e91d7b00b Refactored CSS into different files and removed unused fonts and images. 2015-02-19 15:34:47 -08:00
Sean Li cc50c7a446 Hide scroll bar for mini logs. 2015-02-18 09:43:10 -08:00
Jeffrey Morgan d152005f17 Fixing build 2015-02-17 16:19:51 -08:00
Jeffrey Morgan df559a845f Merge pull request #191 from kitematic/setup-polish
UI Polish
2015-02-17 16:15:05 -08:00
Jeffrey Morgan e8f62ab4d3 Hiding horizontal scrollbar 2015-02-17 16:14:43 -08:00
Jeffrey Morgan 61944b7a2c Fix flash of big image 2015-02-17 16:09:43 -08:00
Jeffrey Morgan d454335f4b Merge pull request #189 from kitematic/fix-logs
Don't show jQuery errors and scroll mini logs
2015-02-17 10:28:17 -08:00
Jeffrey Morgan 20e779a147 Don't show jQuery errors and scroll mini logs 2015-02-17 10:26:20 -08:00
Jeffrey Morgan c858ffa822 Merge pull request #188 from kitematic/fix-reload
Use jQuery to test reload
2015-02-17 10:12:13 -08:00
Jeffrey Morgan c57ac7e58e Use jQuery to test reload 2015-02-17 10:09:07 -08:00
Sean Li 56f3416752 Merge pull request #187 from kitematic/sean-polish
Added Back Button to Preferences Page
2015-02-17 09:45:43 -08:00
Jeffrey Morgan ba6015f5d1 Merge pull request #186 from kitematic/fix-logs-scroll
Fix problem where log overlay scrolls with logs
2015-02-17 09:45:41 -08:00
Sean Li ba9406bf06 Added back button on preferences. 2015-02-17 09:33:11 -08:00
Jeffrey Morgan 33be5faddc Fix problem where log overlay scrolls with logs 2015-02-17 09:30:26 -08:00
Sean Li 9f782d43a1 Merge branch 'master' into sean-polish 2015-02-17 09:17:35 -08:00
Jeffrey Morgan aab1a18649 Merge pull request #185 from kitematic/fix-default-port
Removing select web port for now
2015-02-17 01:17:09 -08:00
Jeffrey Morgan d0d4942a21 Bump version to 0.5.1 2015-02-17 01:16:55 -08:00
Jeffrey Morgan 1df08f96f6 Removing select web port for now 2015-02-17 01:14:58 -08:00
Jeffrey Morgan e08ef44770 Merge pull request #184 from kitematic/fix-rename
Change iframes to use webviews instead
2015-02-17 00:55:34 -08:00
Jeffrey Morgan 2001e36624 Fix reload bug 2015-02-17 00:53:40 -08:00
Jeffrey Morgan cb2e552496 Change iframes to webviews 2015-02-17 00:49:13 -08:00
Jeffrey Morgan ae0d8457c8 Merge pull request #183 from kitematic/fix-rename
Fixing rename bugs
2015-02-16 23:20:51 -08:00