Граф коммитов

1998 Коммитов

Автор SHA1 Сообщение Дата
French Ben bf901c2256 Updated tests to pass
Signed-off-by: French Ben <me+git@frenchben.com>
2015-12-23 20:10:57 -05:00
French Ben 53436e81b2 Updated all electron calls for proper interactions
Signed-off-by: French Ben <me+git@frenchben.com>
2015-12-23 17:11:59 -05:00
French Ben 14bdaf25db Merge pull request #1319 from docker/fix-api
Updated API calls for 1.22 and electron IPC update
2015-12-23 10:15:47 -05:00
French Ben 7a3f4780c9 Updated API calls for 1.9.1 and electron IPC update
Signed-off-by: French Ben <me+git@frenchben.com>

Signed-off-by: French Ben <me+git@frenchben.com>
2015-12-22 18:08:36 -05:00
French Ben a8b5b4f2de bump to 0.9.5
Signed-off-by: French Ben <me+git@frenchben.com>
2015-12-18 17:13:56 -08:00
Jeffrey Morgan 1b44c2007c Look at stderr and stdout for docker-machine status
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-15 13:39:09 -08:00
Jeffrey Morgan f3f35ba0da Fix docker-machine shell out for status command
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-14 16:35:50 -08:00
Jeffrey Morgan 979fa6fd2a Bump version to 0.9.4
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-14 08:57:30 -08:00
Jeffrey Morgan 0cc18ddf9b Merge pull request #1301 from docker/fix-bash-entrypoint
Fix bug where container would be run with bash even thought it has a valid entrypoint
2015-12-13 18:39:06 -08:00
Jeffrey Morgan ad0d7e003f Fix bug where container would be run with bash even with a valid entrypoint
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-13 18:37:05 -08:00
Jeffrey Morgan fe50b66c88 Merge pull request #1300 from docker/fix-vtx-exec
Dont track VTX as an error & fix bugs relating to exec on windows
2015-12-13 18:21:19 -08:00
Jeffrey Morgan 13537af0bc Fix bugs related to exec and dont track VTX as an error
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-13 18:12:27 -08:00
Jeffrey Morgan 07c3c67bf5 Merge pull request #1295 from docker/fix-volume-settings-bugs
Fix bug where renaming or editing container settings would cause volume settings to be lost
2015-12-13 17:47:55 -08:00
Jeffrey Morgan 94f7ce8b71 Fix bug where renaming or editing container settings would cause volume settings to be lost
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-12 17:38:54 -08:00
Jeffrey Morgan 806efdd767 Merge pull request #1280 from docker/bump-version
Bump version, fix exec related error in new version
2015-12-07 14:58:43 -08:00
Jeffrey Morgan ff1960485c Merge pull request #1257 from mikaoelitiana/fix-702-bis
Fix #702
2015-12-07 14:58:29 -08:00
Jeffrey Morgan 31928e6914 Bump version, fix exec related error in new version
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-07 14:54:38 -08:00
Jeffrey Morgan b162d6bd51 Merge pull request #1274 from docker/fix-json-streams
Fix errors due to json streams over sockets
2015-12-04 14:09:09 -08:00
Jeffrey Morgan 262a9cda37 Fix errors due to json streams over sockets
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-04 13:59:30 -08:00
Jeffrey Morgan 548fefc508 Merge pull request #1270 from thaJeztah/update-maintainers
update maintainers file for parsing
2015-12-04 13:48:21 -08:00
Jeffrey Morgan 6ee3742a5d Merge pull request #1273 from docker/fix-event-fetch
Fix error when fetching containers upon daemon events
2015-12-04 13:48:09 -08:00
Jeffrey Morgan 3fc43ec829 Fix error when fetching containers upon daemon events
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-04 13:26:56 -08:00
Sebastiaan van Stijn 3d83d34e22 update maintainers file for parsing
this updates the MAINTAINERS file to the new format,
so that it can be parsed and collected in the docker/opensource
repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-04 17:59:15 +01:00
Mika Andrianarijaona 18a5bfba9b Fix #702 : Cmd+0 reopen Kitematic window in Mac
Signed-off-by: Mika Andrianarijaona <mika@tag-ip.com>
2015-12-02 14:21:58 +03:00
Jeffrey Morgan f8746f4d66 Merge branch 'master' of github.com:docker/kitematic 2015-12-01 12:08:16 -08:00
Jeffrey Morgan 4e14413786 Use generic .zip names for releases, upload to GitHub
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-01 12:08:11 -08:00
French Ben bc6c264989 Merge pull request #1264 from FrenchBen/fix-setup
Updated setup check
2015-12-01 12:05:58 -08:00
French Ben 77c6ce65f8 Updated setup check
Signed-off-by: French Ben <me+git@frenchben.com>
2015-12-01 12:03:55 -08:00
Jeffrey Morgan f93c58da72 Remove reference to container logs
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-01 11:56:13 -08:00
Jeffrey Morgan e78f745329 Build Linux to dist
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-01 10:16:10 -08:00
Jeffrey Morgan dc8b360455 Merge pull request #696 from zedtux/linux-support
Linux support
2015-12-01 10:09:46 -08:00
Guillaume Hain 4e4516da6a
Merge branch 'master' into linux-support 2015-12-01 11:36:42 +01:00
Guillaume Hain 5f1b34ff92 Merge pull request #6 from docker/master
Merge upstream master
2015-12-01 11:34:17 +01:00
Jeffrey Morgan e5ddc4d041 Merge branch 'master' of github.com:docker/kitematic 2015-11-30 14:29:48 -08:00
Jeffrey Morgan 0dd51c775e CI: Release on tags
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-30 14:29:43 -08:00
Jeffrey Morgan 322b17d290 Merge pull request #1199 from docker/fix-log-streaming
Improved log performance and reliability
2015-11-30 14:12:55 -08:00
Jeffrey Morgan 83b2bff850 Improved log performance and reliability
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-30 14:01:39 -08:00
French Ben 321fedb069 Merge pull request #1241 from FrenchBen/enable-debug
Add package option for devTools window on start
2015-11-30 12:51:20 -08:00
French Ben d39b8235b9 Add package option for devTools window on start
Signed-off-by: French Ben <me+git@frenchben.com>
2015-11-30 12:49:06 -08:00
Jeffrey Morgan c1709f5288 Merge pull request #1248 from jeffdm/master
Delete .jshintrc
2015-11-26 11:40:07 -05:00
Jeffrey Morgan 9e9363603d Merge pull request #1253 from SvenDowideit/move-to-docs-base-latest
Use FROM docs/base:latest again
2015-11-26 11:40:01 -05:00
Sven Dowideit 835dc9c047 Use FROM docs/base:latest again
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-11-26 20:17:43 +10:00
Sven Dowideit 8ad771c898 Merge pull request #1247 from SvenDowideit/test-jenkins-checker
Docs validation checker fixes
2015-11-26 12:57:13 +10:00
Jeffrey Morgan adc1f170f5 CI: do not cache homebrew
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-25 19:38:57 -05:00
Jeffrey Morgan ec92514207 CI: add quotes to circle yml
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-25 19:26:59 -05:00
Jeffrey Morgan d8de60d612 Bump electron to 0.33.9
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-25 18:52:18 -05:00
Jeffrey Morgan 252049115e Put zip files in release dir
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-25 18:45:24 -05:00
Jeffrey Morgan 241b354c66 CI: cache cellar
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-25 18:38:57 -05:00
Jeffrey Morgan 574e980625 Merge branch 'master' of github.com:docker/kitematic 2015-11-25 18:23:24 -05:00
Jeffrey Morgan 65cea9e82a CI: proper circle cache syntax
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-25 18:23:19 -05:00