Commit Graph

1149 Commits

Author SHA1 Message Date
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
Jeffrey Morgan 8812d533d4 Merge branch 'jmorgan-fix-transitionto' 2015-01-25 13:30:29 -05:00
Jeffrey Morgan 30f25c5cd7 Merge branch 'jmorgan-fix-transitionto' 2015-01-25 13:30:29 -05:00
Jeffrey Morgan ab815d5426 Adding correct blue to download button 2015-01-25 13:30:10 -05:00
Jeffrey Morgan bcaa6576ba Adding correct blue to download button 2015-01-25 13:30:10 -05:00
Jeffrey Morgan 2f599dc092 Merge and cleanup 2015-01-25 13:29:51 -05:00
Jeffrey Morgan 992a1c12c6 Merge and cleanup 2015-01-25 13:29:51 -05:00
Sean Li ef5a201a9a Added Kitematic to title. 2015-01-23 17:38:27 -08:00
Sean Li 445f0cf608 Added Kitematic to title. 2015-01-23 17:38:27 -08:00
Sean Li 5530cc53c6 Added tooltips. 2015-01-23 17:19:08 -08:00
Sean Li 2fbff2a382 Added tooltips. 2015-01-23 17:19:08 -08:00
Sean Li 155cbd3e23 Added missing image. 2015-01-23 14:56:38 -08:00
Sean Li af63f51212 Added missing image. 2015-01-23 14:56:38 -08:00
Sean Li 13f91ced45 New status images. 2015-01-23 14:55:03 -08:00
Sean Li 11ff191ba8 New status images. 2015-01-23 14:55:03 -08:00
Jeffrey Morgan 09a7527458 WIP new events 2015-01-23 16:49:25 -05:00
Jeffrey Morgan 1f1ec98a29 WIP new events 2015-01-23 16:49:25 -05:00
Sean Li 327a567cec Modal styles. 2015-01-23 13:48:46 -08:00
Sean Li d921e62349 Modal styles. 2015-01-23 13:48:46 -08:00
Sean Li 9e05f14117 Added styles to text. 2015-01-23 11:41:59 -08:00