Commit Graph

6 Commits

Author SHA1 Message Date
Jeffrey Morgan c338678094 Merge remote-tracking branch 'origin/sean-polish'
Conflicts:
src/Radial.react.js
src/Setup.react.js
styles/radial.less
2015-02-13 10:44:00 -08:00
Jeffrey Morgan 30fb489edd Better spinners 2015-02-06 12:08:42 -05:00
Sean Li a26ef466cf Fixed animation not syncing bug and added container icon. 2015-02-04 12:54:43 -08:00
Sean Li ecb45f0102 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 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