Commit Graph

379 Commits

Author SHA1 Message Date
Jeffrey Morgan b24e5c1d91 Fullscreen support 2015-01-13 17:20:27 -05:00
Jeffrey Morgan 42417c3523 traffic lights 2015-01-13 16:45:18 -05:00
Jeffrey Morgan 4c3d3ad08b 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 f7087e4e6b Merge branch 'master' into jmorgan_react_refactor 2015-01-12 09:36:11 -05:00
Jeffrey Morgan 13cd6ed0b4 Ported kitematic setup 2015-01-12 09:28:29 -05:00
Jeffrey Morgan ad8cfbe5a1 Merge pull request #152 from kitematic/jmorgan_fix_metrics_images
Fix metrics & hide images with <none>:<none> tag
2015-01-06 16:16:28 -08:00
Jeffrey Morgan eaaf813ac1 Fixing random containers created 2015-01-06 16:15:53 -08:00
Jeffrey Morgan 553b0773c8 fixing metrics 2015-01-06 15:20:09 -08:00
Jeffrey Morgan a4c085a361 bump version 2015-01-06 15:13:15 -08:00
Jeffrey Morgan 34fd6aaebb Fix metrics and untagged images 2015-01-06 15:13:01 -08:00
Jeffrey Morgan be51f26065 Adding livereload, react-router base 2014-12-30 18:01:27 -05:00
Jeffrey Morgan 01e3521f92 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 70fb66297b Basic asset pipeline for atom-shell based development & release 2014-12-21 00:08:50 -05:00
Jeffrey Morgan 593e793f0c Merge pull request #141 from kitematic/jmorgan_bump_0.4.3
Bumping version to 0.4.3
2014-12-19 10:50:51 -08:00
Jeff Morgan e8696d7fd5 Merge branch 'master' into jmorgan_bump_0.4.3 2014-12-16 07:21:37 -08:00
Jeffrey Morgan 386b8bbc2c Merge pull request #142 from kitematic/jmorgan_fix_image_tags
Fixing image tag ordering and rendering
2014-12-15 22:03:29 -08:00
Jeff Morgan 44ed5d9479 Fixing image tag ordering and rendering 2014-12-15 22:01:29 -08:00
Jeff Morgan 630d233799 bumping version 2014-12-14 22:49:28 -08:00
Jeffrey Morgan 4754fc82b4 Merge pull request #140 from kitematic/jmorgan_fix_terminal_spaces
Fix bug where terminal button fails if spaces in Kitematic.app path
2014-12-14 22:42:16 -08:00
Jeff Morgan 88cf79569a Fix bug where terminal button fails if spaces in Kitematic.app path 2014-12-14 22:41:06 -08:00
Jeffrey Morgan 9a92f1cf35 Merge pull request #139 from kitematic/jmorgan_fix_app_image_sync
Fixing bugs that occur with sync when containers fail to run
2014-12-14 21:04:21 -08:00
Jeff Morgan 6ce5da9a78 Fixing bugs that occur with sync when containers fail to run 2014-12-14 21:03:08 -08:00
Jeff Morgan 95d61cb7bb Dont track node license 2014-12-11 22:14:21 -08:00
Jeff Morgan 641bc309ad fixing names 2014-12-10 19:21:54 -08:00
Jeff Morgan aaa6d6d921 removing log print 2014-12-10 19:13:58 -08:00
Jeffrey Morgan 99a27bd398 Merge pull request #136 from kitematic/jmorgan_bump_v0.4.2
Bump 0.4.2
2014-12-10 19:00:03 -08:00
Jeffrey Morgan 5e2b22938f Merge pull request #135 from kitematic/jmorgan_fix_metrics
Change localstore data to leveldb
2014-12-10 18:56:22 -08:00
Jeff Morgan 70aa80fccc Bump 0.4.2 2014-12-10 18:55:43 -08:00
Jeff Morgan 18e3978bda Moving to leveldb 2014-12-10 18:55:03 -08:00
Jeff Morgan 26e42af48f fixing settings page 2014-12-10 17:44:48 -08:00
Jeff Morgan bd691f97f7 Changing to leveldb 2014-12-10 17:29:37 -08:00
Jeffrey Morgan 9c483d8881 Merge pull request #134 from kitematic/jmorgan_fix_sync
Fixing sync bug where deleted container would re-appear after deletion
2014-12-09 23:09:10 -08:00
Jeff Morgan d64e347850 Fixing sync bug where deleted container would re-appear after deletion 2014-12-09 22:58:15 -08:00
Jeffrey Morgan 9e3c063fe9 Merge pull request #133 from kitematic/jmorgan_official_library
Use official library
2014-12-09 16:14:06 -08:00
Jeff Morgan 8630c4d646 Use official library 2014-12-09 16:13:42 -08:00
Jeffrey Morgan 23d326ef41 Merge pull request #132 from kitematic/jmorgan_bump_0.4.1
Bump version to 0.4.1
2014-12-09 11:18:25 -08:00
Jeff Morgan 4c14c0f928 Merge branch 'master' into jmorgan_bump_0.4.1 2014-12-09 11:03:12 -08:00
Jeffrey Morgan e53ab9371c Merge pull request #131 from kitematic/jmorgan_fix_cmdq
fixing cmd+q accelerator
2014-12-09 11:02:50 -08:00
Jeff Morgan 7838df68ee fixing cmd+q accelerator 2014-12-09 11:02:28 -08:00
Jeff Morgan b61d5a20eb Merge branch 'master' into jmorgan_bump_0.4.1 2014-12-09 10:55:27 -08:00
Jeffrey Morgan 24125c3d22 Merge pull request #130 from kitematic/jmorgan_fix_app_sync
Delete any app that isn't reflected in Docker
2014-12-09 10:55:04 -08:00
Jeff Morgan ca9110d75a Delete any app that isn't reflected in Docker 2014-12-09 10:54:46 -08:00
Jeff Morgan 0fd8c87f9b Merge branch 'master' into jmorgan_bump_0.4.1 2014-12-09 10:50:04 -08:00
Jeffrey Morgan 8058c39120 Merge pull request #129 from kitematic/jmorgan_fix_app_sync
Putting back App object removal
2014-12-09 10:49:12 -08:00
Jeff Morgan 6456650154 Putting back App object removal 2014-12-09 10:48:59 -08:00
Jeff Morgan a80257cdc5 Merge branch 'master' into jmorgan_bump_0.4.1 2014-12-09 10:38:47 -08:00
Jeffrey Morgan 46c128b295 Merge pull request #128 from kitematic/jmorgan_fix_appdelete
Fixing but where app would not be deleted
2014-12-09 10:38:27 -08:00
Jeff Morgan aeffbc305d Fixing but where app would not be deleted 2014-12-09 10:37:07 -08:00
Jeff Morgan 9a4a6eec42 bump version 2014-12-09 10:05:40 -08:00
Jeff Morgan 1ab568b3ea Removing legacy upload script 2014-12-06 15:27:20 -05:00