Commit Graph

891 Commits

Author SHA1 Message Date
Sean Li 88dca22e1e Merge branch 'master' into restyle
Conflicts:
	src/ContainerDetails.react.js
2015-02-03 17:32:11 -08:00
Jeffrey Morgan 2a8f852a08 Merge branch 'master' of github.com:kitematic/kitematic 2015-02-03 20:31:37 -05:00
Jeffrey Morgan ac8e8be2fa Merge branch 'master' of github.com:kitematic/kitematic 2015-02-03 20:31:37 -05:00
Jeffrey Morgan 688fba2700 dynamic Docker host 2015-02-03 20:31:34 -05:00
Jeffrey Morgan f7aa4c32fc dynamic Docker host 2015-02-03 20:31:34 -05:00
Sean Li 263debf312 Made default page working. 2015-02-03 16:29:15 -08:00
Sean Li d3627561a1 Made default page working. 2015-02-03 16:29:15 -08:00
Jeffrey Morgan 6147470372 Update README.md 2015-02-03 19:02:39 -05:00
Jeffrey Morgan fb41f32391 Update README.md 2015-02-03 19:02:39 -05:00
Jeffrey Morgan 8c905058a8 Merge pull request #171 from kitematic/jmorgan-wip-tests
Making default port a checkbox
2015-02-03 18:16:32 -05:00
Jeffrey Morgan 923468f482 Merge pull request #171 from kitematic/jmorgan-wip-tests
Making default port a checkbox
2015-02-03 18:16:32 -05:00
Jeffrey Morgan a4ec10b196 Making default port a checkbox 2015-02-03 18:16:09 -05:00
Jeffrey Morgan b5979fff04 Making default port a checkbox 2015-02-03 18:16:09 -05:00
Jeffrey Morgan d65e29bc7c Merge pull request #170 from kitematic/jmorgan-wip-tests
WIP 0.5 beta
2015-02-03 18:10:12 -05:00
Jeffrey Morgan 9c8d66447f Merge pull request #170 from kitematic/jmorgan-wip-tests
WIP 0.5 beta
2015-02-03 18:10:12 -05:00
Jeffrey Morgan e2346cc012 WIP beta 2015-02-03 17:45:16 -05:00
Jeffrey Morgan 46ae968100 WIP beta 2015-02-03 17:45:16 -05:00
Sean Li 927629b1d8 Stricter lint checks. 2015-02-03 14:30:04 -08:00
Sean Li 3ba951ce94 Stricter lint checks. 2015-02-03 14:30:04 -08:00
Sean Li 3b9244159e Fixed browser window not opening. 2015-02-03 14:20:01 -08:00
Sean Li 117ddb6fa9 Fixed browser window not opening. 2015-02-03 14:20:01 -08:00
Sean Li c78549a45f Cleanup and linting. 2015-02-03 14:19:05 -08:00
Sean Li 248a62b740 Cleanup and linting. 2015-02-03 14:19:05 -08:00
Sean Li ecb45f0102 Added stricter lint standard. 2015-02-03 14:11:27 -08:00
Sean Li e4c535f9fb Added stricter lint standard. 2015-02-03 14:11:27 -08:00
Sean Li bf3d5b3268 Refactored some basic elements. 2015-02-03 13:38:31 -08:00
Sean Li 2902ff6f49 Refactored some basic elements. 2015-02-03 13:38:31 -08:00
Sean Li 02c606d8b8 Merge branch 'master' into restyle
Conflicts:
	app/ContainerDetails.react.js
	app/ContainerModal.react.js
	app/styles/main.less
2015-02-03 12:58:34 -08:00
Sean Li 9e068acfea Merge branch 'master' into restyle
Conflicts:
	app/ContainerDetails.react.js
	app/ContainerModal.react.js
	app/styles/main.less
2015-02-03 12:58:34 -08:00
Sean Li 034dd15234 Style tweak. 2015-02-03 11:06:49 -08:00
Sean Li 2c2442783e Style tweak. 2015-02-03 11:06:49 -08:00
Jeffrey Morgan b4b171d0ee Merge pull request #169 from kitematic/jmorgan-wip-tests
WIP tests
2015-02-02 12:07:24 -05:00
Jeffrey Morgan fa14cb0731 Merge pull request #169 from kitematic/jmorgan-wip-tests
WIP tests
2015-02-02 12:07:24 -05:00
Jeffrey Morgan 90ee518905 Removing virtual box installer tool for now 2015-02-02 12:07:08 -05:00
Jeffrey Morgan 60975b009b Removing virtual box installer tool for now 2015-02-02 12:07:08 -05:00
Jeffrey Morgan 21f1ec1cca Fixed problems with boot2docker integration, cleaned up tests. 2015-02-02 12:05:56 -05:00
Jeffrey Morgan eff2b0fd73 Fixed problems with boot2docker integration, cleaned up tests. 2015-02-02 12:05:56 -05:00
Jeffrey Morgan c7d3bffc7f WIP tests 2015-02-02 00:33:36 -05:00
Jeffrey Morgan 204b5b3f19 WIP tests 2015-02-02 00:33:36 -05:00
Sean Li 3204568b12 Tweaked icon button size. 2015-01-31 21:06:17 -08:00
Sean Li bcb2c9936a Tweaked icon button size. 2015-01-31 21:06:17 -08:00
Sean Li bb122b2044 Minor bug fixes and style tweak. 2015-01-31 21:00:35 -08:00
Sean Li b4b5f91675 Minor bug fixes and style tweak. 2015-01-31 21:00:35 -08:00
Jeffrey Morgan cfa6e96286 Kill trailing spec processes 2015-01-31 01:22:41 -05:00
Jeffrey Morgan daf9f1904c Kill trailing spec processes 2015-01-31 01:22:41 -05:00
Jeffrey Morgan 8d620c70bf Merge pull request #168 from kitematic/jmorgan-cleanup
Adding jasmine unit tests
2015-01-31 01:13:57 -05:00
Jeffrey Morgan 0e54f70c1d Merge pull request #168 from kitematic/jmorgan-cleanup
Adding jasmine unit tests
2015-01-31 01:13:57 -05:00
Jeffrey Morgan a8ba0b9527 Fixing tests 2015-01-31 01:01:06 -05:00
Jeffrey Morgan cb44886925 Fixing tests 2015-01-31 01:01:06 -05:00
Jeffrey Morgan 289549c495 Adding jasmine unit tests 2015-01-30 23:05:08 -05:00