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

..

fonts

Pull & Run containers

2015-01-17 13:15:26 -05:00

images

Merge branch 'master' into sean

2015-01-25 10:44:22 -08:00

styles

Merge branch 'master' into container-dropdowns

2015-01-27 17:05:11 -05:00

boot2docker.js

Fix setup & don't show build containers

2015-01-26 23:48:33 -05:00

ContainerDetails.react.js

Merge branch 'master' into container-dropdowns

2015-01-27 17:05:11 -05:00

ContainerDetailsSettings.react.js

Styled environment variables settings section.

2015-01-26 16:58:28 -08:00

ContainerList.react.js

WIP new events

2015-01-23 16:49:25 -05:00

ContainerModal.react.js

Merge branch 'master' into container-dropdowns

2015-01-27 17:05:11 -05:00

Containers.react.js

Merge branch 'master' into container-dropdowns

2015-01-27 17:05:11 -05:00

ContainerStore.js

Merge branch 'master' into container-dropdowns

2015-01-27 17:05:11 -05:00

ContainerUtil.js

Displays ports and volumes dropdown.

2015-01-27 13:02:58 -08:00

docker.js

Pull & Run containers

2015-01-17 13:15:26 -05:00

Header.react.js

WIP new events

2015-01-23 16:49:25 -05:00

index.html

Merge branch 'master' into container-dropdowns

2015-01-27 17:05:11 -05:00

main.js

Merge branch 'master' into container-dropdowns

2015-01-27 17:05:11 -05:00

Menu.js

Merge branch 'master' into container-dropdowns

2015-01-27 17:05:11 -05:00

NoContainers.react.js

Merge and cleanup

2015-01-25 13:29:51 -05:00

Preferences.react.js

Merge branch 'master' into container-dropdowns

2015-01-27 17:05:11 -05:00

Radial.react.js

Fix setup & don't show build containers

2015-01-26 23:48:33 -05:00

registry.js

Image sizes & total progress. Restructure events

2015-01-20 21:49:14 -05:00

router.js

Transition to newly created containers

2015-01-22 10:59:25 -05:00

routes.js

Merge branch 'master' into container-dropdowns

2015-01-27 17:05:11 -05:00

Setup.react.js

Merge branch 'master' into container-dropdowns

2015-01-27 17:05:11 -05:00

util.js

Fix setup & don't show build containers

2015-01-26 23:48:33 -05:00

virtualbox.js

Fix setup & don't show build containers

2015-01-26 23:48:33 -05:00