Commit Graph

410 Commits

Author SHA1 Message Date
Jeffrey Morgan ac8e8be2fa Merge branch 'master' of github.com:kitematic/kitematic 2015-02-03 20:31:37 -05:00
Jeffrey Morgan f7aa4c32fc dynamic Docker host 2015-02-03 20:31:34 -05:00
Jeffrey Morgan fb41f32391 Update README.md 2015-02-03 19:02:39 -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 b5979fff04 Making default port a checkbox 2015-02-03 18:16:09 -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 46ae968100 WIP beta 2015-02-03 17:45:16 -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 60975b009b Removing virtual box installer tool for now 2015-02-02 12:07:08 -05:00
Jeffrey Morgan eff2b0fd73 Fixed problems with boot2docker integration, cleaned up tests. 2015-02-02 12:05:56 -05:00
Jeffrey Morgan 204b5b3f19 WIP tests 2015-02-02 00:33:36 -05:00
Jeffrey Morgan daf9f1904c Kill trailing spec processes 2015-01-31 01:22:41 -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 cb44886925 Fixing tests 2015-01-31 01:01:06 -05:00
Jeffrey Morgan e73e1c59e4 Adding jasmine unit tests 2015-01-30 23:05:08 -05:00
Jeffrey Morgan e0bbdb382d Rename virtualbox.js to Virtualbox.js 2015-01-30 16:05:49 -05:00
Jeffrey Morgan 8e046bcd58 Rename router.js to Router.js 2015-01-30 16:05:42 -05:00
Jeffrey Morgan 8fd58e2861 Merge branch 'master' into jmorgan-cleanup 2015-01-30 15:31:43 -05:00
Jeffrey Morgan 403a8ca27d Delete test.css 2015-01-30 15:26:41 -05:00
Jeffrey Morgan 8a3ef29265 Merge pull request #167 from kitematic/jmorgan-cleanup
Cleaning Up filenames and build+run process
2015-01-30 15:25:37 -05:00
Jeffrey Morgan f3919d02d0 Fixing case 2015-01-30 15:22:01 -05:00
Jeffrey Morgan ba6fb4f657 Fixing case 2015-01-30 15:21:55 -05:00
Jeffrey Morgan 5f164ccca9 Removing gulp dependency, making file hierarchy easier to understand. 2015-01-30 13:21:51 -05:00
Jeffrey Morgan e00454f1ba Merge pull request #165 from kitematic/container-dropdowns
Added drop down settings for container ports and volumes.
2015-01-29 16:54:44 -05:00
Jeffrey Morgan c931112c80 Merge 2015-01-29 16:54:36 -05:00
Jeffrey Morgan 26b370e176 Functional dropdown 2015-01-29 16:52:34 -05:00
Jeffrey Morgan 5162934794 Merge branch 'master' into container-dropdowns
Conflicts:
app/ContainerDetails.react.js
app/ContainerModal.react.js
app/styles/main.less
2015-01-27 17:05:11 -05:00
Jeffrey Morgan 29c96bc0d5 Merge pull request #166 from kitematic/jmorgan-preferences
Adding preferences pane
2015-01-27 16:13:47 -05:00
Jeffrey Morgan c741b0bf1f Removing unnecessary logging 2015-01-27 16:09:26 -05:00
Sean Li b484233d4c Displays ports and volumes dropdown. 2015-01-27 13:02:58 -08:00
Jeffrey Morgan e16b32965f Menu + Preferences 2015-01-27 15:47:30 -05:00
Sean Li d80d259f98 FIxed env var bugs. 2015-01-27 09:39:46 -08:00
Sean Li 340bfd3122 Merge pull request #163 from kitematic/jmorgan-container-merge
Update Existing containers
2015-01-27 09:24:50 -08:00
Jeffrey Morgan 03b24bb849 Adding terminal button 2015-01-27 11:13:48 -05:00
Jeffrey Morgan d9ec2203e4 Fix setup & don't show build containers 2015-01-26 23:48:33 -05:00
Jeffrey Morgan bde27af83f updateContainer method for ContainerStore 2015-01-26 21:43:51 -05:00
Jeffrey Morgan 441a1e8f0f Merge remote-tracking branch 'origin/sean' into jmorgan-container-merge
Conflicts:
	app/ContainerDetails.react.js
	app/ContainerModal.react.js
	app/styles/main.less
2015-01-26 21:10:20 -05:00
Sean Li e42a47659a Merge pull request #161 from kitematic/jmorgan_add_tags
Add tag dropdown for creating containers with a specific image tag
2015-01-26 16:59:30 -08:00
Sean Li 8d9f51efa5 Styled environment variables settings section. 2015-01-26 16:58:28 -08:00
Jeffrey Morgan 9955a98f2c Updating main.less 2015-01-26 19:52:44 -05:00
Jeffrey Morgan 5568f1e3ba Add tag dropdown menu to create buttons 2015-01-26 19:52:25 -05:00
Sean Li afd615cfc7 Added delete container functionality. 2015-01-25 22:28:49 -08:00
Sean Li 9b81d6bb7e Button content spacing. 2015-01-25 17:04:02 -08:00
Sean Li 723e3a803c Fixed tab style. 2015-01-25 17:03:09 -08:00
Sean Li 159af526f2 Fixed button styles. 2015-01-25 16:57:27 -08:00
Sean Li 255d2f5e44 Added missing modules and fixed merge conflict. 2015-01-25 10:57:51 -08:00
Sean Li a743656188 Merge branch 'master' into sean
Conflicts:
	app/styles/containers.less
2015-01-25 10:44:22 -08:00
Jeffrey Morgan f365cf45e8 removing identity for now 2015-01-25 13:42:33 -05:00
Jeffrey Morgan 30f25c5cd7 Merge branch 'jmorgan-fix-transitionto' 2015-01-25 13:30:29 -05:00
Jeffrey Morgan bcaa6576ba Adding correct blue to download button 2015-01-25 13:30:10 -05:00