Commit Graph

1068 Commits

Author SHA1 Message Date
Jeffrey Morgan b79ae5c190 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 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 499bbc233a Merge 2015-01-29 16:54:36 -05:00
Jeffrey Morgan c931112c80 Merge 2015-01-29 16:54:36 -05:00
Jeffrey Morgan 9b1edbb7e7 Functional dropdown 2015-01-29 16:52:34 -05:00
Jeffrey Morgan 26b370e176 Functional dropdown 2015-01-29 16:52:34 -05:00
Jeffrey Morgan 475654e42c 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 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 fba00223a2 Merge pull request #166 from kitematic/jmorgan-preferences
Adding preferences pane
2015-01-27 16:13:47 -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 86afb4d253 Removing unnecessary logging 2015-01-27 16:09:26 -05:00
Jeffrey Morgan c741b0bf1f Removing unnecessary logging 2015-01-27 16:09:26 -05:00
Sean Li a671c11f2f Displays ports and volumes dropdown. 2015-01-27 13:02:58 -08:00
Sean Li b484233d4c Displays ports and volumes dropdown. 2015-01-27 13:02:58 -08:00
Jeffrey Morgan 05d0f5a740 Menu + Preferences 2015-01-27 15:47:30 -05:00
Jeffrey Morgan e16b32965f Menu + Preferences 2015-01-27 15:47:30 -05:00
Sean Li e88830185c FIxed env var bugs. 2015-01-27 09:39:46 -08:00
Sean Li d80d259f98 FIxed env var bugs. 2015-01-27 09:39:46 -08:00
Sean Li ca69727d42 Merge pull request #163 from kitematic/jmorgan-container-merge
Update Existing containers
2015-01-27 09:24:50 -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 5586831b48 Adding terminal button 2015-01-27 11:13:48 -05:00
Jeffrey Morgan 03b24bb849 Adding terminal button 2015-01-27 11:13:48 -05:00
Jeffrey Morgan f4c703ba03 Fix setup & don't show build containers 2015-01-26 23:48:33 -05:00
Jeffrey Morgan d9ec2203e4 Fix setup & don't show build containers 2015-01-26 23:48:33 -05:00
Jeffrey Morgan cbefb542ff updateContainer method for ContainerStore 2015-01-26 21:43:51 -05:00
Jeffrey Morgan bde27af83f updateContainer method for ContainerStore 2015-01-26 21:43:51 -05:00
Jeffrey Morgan 257739f09d 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
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 60da02ba0c 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 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 04cfc3c261 Styled environment variables settings section. 2015-01-26 16:58:28 -08:00
Sean Li 8d9f51efa5 Styled environment variables settings section. 2015-01-26 16:58:28 -08:00
Jeffrey Morgan 5e8f62fbc4 Updating main.less 2015-01-26 19:52:44 -05:00
Jeffrey Morgan 9955a98f2c Updating main.less 2015-01-26 19:52:44 -05:00
Jeffrey Morgan 80aa3bac03 Add tag dropdown menu to create buttons 2015-01-26 19:52:25 -05:00
Jeffrey Morgan 5568f1e3ba Add tag dropdown menu to create buttons 2015-01-26 19:52:25 -05:00
Sean Li cb5f10a056 Added delete container functionality. 2015-01-25 22:28:49 -08:00
Sean Li afd615cfc7 Added delete container functionality. 2015-01-25 22:28:49 -08:00
Sean Li 0a6b776739 Button content spacing. 2015-01-25 17:04:02 -08:00
Sean Li 9b81d6bb7e Button content spacing. 2015-01-25 17:04:02 -08:00
Sean Li cbc0518f2a Fixed tab style. 2015-01-25 17:03:09 -08:00
Sean Li 723e3a803c Fixed tab style. 2015-01-25 17:03:09 -08:00
Sean Li e9943328ea Fixed button styles. 2015-01-25 16:57:27 -08:00
Sean Li 159af526f2 Fixed button styles. 2015-01-25 16:57:27 -08:00
Sean Li db1facdd80 Added missing modules and fixed merge conflict. 2015-01-25 10:57:51 -08:00
Sean Li 255d2f5e44 Added missing modules and fixed merge conflict. 2015-01-25 10:57:51 -08:00
Sean Li 6465678139 Merge branch 'master' into sean
Conflicts:
	app/styles/containers.less
2015-01-25 10:44:22 -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 935fa8b6dd removing identity for now 2015-01-25 13:42:33 -05:00
Jeffrey Morgan f365cf45e8 removing identity for now 2015-01-25 13:42:33 -05:00