Commit Graph

69 Commits

Author SHA1 Message Date
Jeffrey Morgan
613c944f0c Fixing rename bugs 2015-02-16 23:18:42 -08:00
Jeffrey Morgan
de6747627e Removing web dependency 2015-02-16 20:03:28 -08:00
Jeffrey Morgan
d5fe018a7e Optimizations for testing 2015-02-16 19:58:00 -08:00
Sean Li
b248d3c552 Merge pull request #180 from kitematic/sean-polish
Tags, Auto-update UI and Polishing
2015-02-16 16:01:15 -08:00
Jeffrey Morgan
0c3f71b75c Changing 6to5 to babel 2015-02-16 14:12:26 -08:00
Jeffrey Morgan
bd4656d457 Fixing babel devdep 2015-02-16 14:05:07 -08:00
Jeffrey Morgan
6a2f766e6f Fixing babel dep 2015-02-16 14:04:18 -08:00
Jeffrey Morgan
02193a3774 Switching to circleci 2015-02-16 14:01:46 -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
Jeffrey Morgan
3415ad7bb9 Using localstorage 2015-02-16 11:57:13 -08:00
Sean Li
318930d8a0 Installer patch and updated package.json 2015-02-13 11:53:44 -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
a8a490ea70 Reverting to 1.4.1 for now 2015-02-11 15:10:12 -08:00
Jeffrey Morgan
621b0503ab Adding Setup tests and settings fix 2015-02-11 15:09:17 -08:00
Jeffrey Morgan
cb437f1d89 Merging 2015-02-09 21:24:12 -08:00
Jeffrey Morgan
b426c802f4 Removing some log statements 2015-02-05 23:14:16 -05:00
Jeffrey Morgan
c1879ea7a0 Merge 2015-02-05 22:02:09 -05:00
Jeffrey Morgan
88d39d2505 Promises, virtual box & boot2docker integration tests 2015-02-05 21:02:46 -05:00
Sean Li
9709e5fec4 Grid implementation. 2015-02-04 12:44:48 -08:00
Sean Li
ca19d62000 Merge branch 'master' into restyle
Conflicts:
	src/ContainerDetails.react.js
2015-02-03 17:32:11 -08:00
Sean Li
263debf312 Made default page working. 2015-02-03 16:29:15 -08:00
Jeffrey Morgan
e2346cc012 WIP beta 2015-02-03 17:45:16 -05:00
Jeffrey Morgan
21f1ec1cca Fixed problems with boot2docker integration, cleaned up tests. 2015-02-02 12:05:56 -05:00
Jeffrey Morgan
c7d3bffc7f WIP tests 2015-02-02 00:33:36 -05:00
Jeffrey Morgan
cfa6e96286 Kill trailing spec processes 2015-01-31 01:22:41 -05:00
Jeffrey Morgan
a8ba0b9527 Fixing tests 2015-01-31 01:01:06 -05:00
Jeffrey Morgan
289549c495 Adding jasmine unit tests 2015-01-30 23:05:08 -05:00
Jeffrey Morgan
9057c59378 Fixing case 2015-01-30 15:21:55 -05:00
Jeffrey Morgan
b61697055a Removing gulp dependency, making file hierarchy easier to understand. 2015-01-30 13:21:51 -05:00
Jeffrey Morgan
05d0f5a740 Menu + Preferences 2015-01-27 15:47:30 -05:00
Sean Li
db1facdd80 Added missing modules and fixed merge conflict. 2015-01-25 10:57:51 -08:00
Jeffrey Morgan
2f599dc092 Merge and cleanup 2015-01-25 13:29:51 -05:00
Jeffrey Morgan
09a7527458 WIP new events 2015-01-23 16:49:25 -05:00
Jeffrey Morgan
7e74481e85 Pull & Run containers 2015-01-17 13:15:26 -05:00
Jeffrey Morgan
5245b5ee2a traffic lights 2015-01-13 16:45:18 -05:00
Jeffrey Morgan
6bdfdb0b12 Merge branch 'master' of github.com:kitematic/kitematic into jmorgan_react_refactor
Conflicts:
	meteor/client/lib/apputil.js
	meteor/client/lib/docker.js
	meteor/client/lib/imageutil.js
	meteor/client/lib/metrics.js
	meteor/client/lib/startup.js
	meteor/client/lib/util.js
	meteor/client/main.js
2015-01-12 09:36:50 -05:00
Jeffrey Morgan
5f06cb9ad3 Ported kitematic setup 2015-01-12 09:28:29 -05:00
Jeffrey Morgan
7e36b8c6c1 bump version 2015-01-06 15:13:15 -08:00
Jeffrey Morgan
592754fad0 Adding livereload, react-router base 2014-12-30 18:01:27 -05:00
Jeffrey Morgan
424bccc3a9 Node & test environment
- Fix environment to require no node install and more straightforward
- Add jasmine files
2014-12-27 16:32:52 -05:00
Jeff Morgan
cbe538ae54 Basic asset pipeline for atom-shell based development & release 2014-12-21 00:08:50 -05:00
Jeff Morgan
dd558f6a94 bumping version 2014-12-14 22:49:28 -08:00
Jeffrey Morgan
c30a0ffa6f Merge pull request #136 from kitematic/jmorgan_bump_v0.4.2
Bump 0.4.2
2014-12-10 19:00:03 -08:00
Jeff Morgan
ba1c9564e4 Bump 0.4.2 2014-12-10 18:55:43 -08:00
Jeff Morgan
f1d1f9e155 Changing to leveldb 2014-12-10 17:29:37 -08:00
Jeff Morgan
bf75a62471 Use official library 2014-12-09 16:13:42 -08:00
Jeff Morgan
fd5d54a313 bump version 2014-12-09 10:05:40 -08:00
Jeff Morgan
2229249b02 Removing unnecessary packages. 2014-12-06 14:44:07 -05:00
Jeff Morgan
0bb1153103 Initial implementation of mixpanel instead of GA 2014-12-06 14:41:59 -05:00
Jeff Morgan
1ddae14b6d fixing bug where docker vm would require update on every load 2014-11-29 16:10:46 -05:00