Jeffrey Morgan
|
fb5c472e73
|
Merge branch 'master' into fix-log-scroll
Conflicts:
src/NewContainer.react.js
|
2015-02-16 17:51:52 -08:00 |
|
Jeffrey Morgan
|
1f368771f6
|
Merge branch 'master' into fix-log-scroll
Conflicts:
src/NewContainer.react.js
|
2015-02-16 17:49:25 -08:00 |
|
Jeffrey Morgan
|
75de3328a5
|
Lock scroll to bottom for logs
|
2015-02-16 16:51:45 -08:00 |
|
Jeffrey Morgan
|
f3673a5588
|
Fixing search with promises
|
2015-02-16 16:12:17 -08:00 |
|
Jeffrey Morgan
|
da27dd07a2
|
Removing logs & creating
|
2015-02-16 15:04:00 -08:00 |
|
Sean Li
|
4061544976
|
Merge branch 'master' into sean-polish
Conflicts:
src/NewContainer.react.js
src/Setup.react.js
src/SetupStore.js
|
2015-02-16 13:42:23 -08:00 |
|
Sean Li
|
bebb2395f9
|
Implemented tags dropdown.
|
2015-02-16 10:50:26 -08:00 |
|
Jeffrey Morgan
|
5110b5c144
|
Moved log data to LogStore
|
2015-02-15 22:14:11 -08:00 |
|
Jeffrey Morgan
|
33a93f6a30
|
Moved recommended repos from ContainerStore to NewContainer.react.js
|
2015-02-15 18:01:49 -08:00 |
|
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
|
621b0503ab
|
Adding Setup tests and settings fix
|
2015-02-11 15:09:17 -08:00 |
|
Sean Li
|
f9e6fd40b6
|
Fixed a SSL image error.
|
2015-02-06 10:54:33 -08:00 |
|
Jeffrey Morgan
|
925223a472
|
add loading after button press
|
2015-02-06 12:14:38 -05:00 |
|
Jeffrey Morgan
|
24f8062f06
|
Merge branch 'jmorgan-merge-restyle' of github.com:kitematic/kitematic into jmorgan-merge-restyle
Conflicts:
src/ContainerDetails.react.js
|
2015-02-06 12:09:04 -05:00 |
|
Jeffrey Morgan
|
30fb489edd
|
Better spinners
|
2015-02-06 12:08:42 -05:00 |
|
Sean Li
|
459ca9c6e5
|
Restyle.
|
2015-02-05 21:55:47 -08:00 |
|
Jeffrey Morgan
|
c1879ea7a0
|
Merge
|
2015-02-05 22:02:09 -05:00 |
|
Sean Li
|
79b9cf3bc1
|
Folder widget and recommended images.
|
2015-02-05 11:47:27 -08:00 |
|
Sean Li
|
a26ef466cf
|
Fixed animation not syncing bug and added container icon.
|
2015-02-04 12:54:43 -08:00 |
|
Sean Li
|
9709e5fec4
|
Grid implementation.
|
2015-02-04 12:44:48 -08:00 |
|
Sean Li
|
263debf312
|
Made default page working.
|
2015-02-03 16:29:15 -08:00 |
|