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

2027 Коммитов

Автор SHA1 Сообщение Дата
Arjun Patel 7f84fa821a The Cmd+ and Cmd- hotkeys zoom in/out the contaier logs.
Signed-off-by: Arjun Patel <arjun453@gmail.com>
2016-04-12 21:18:38 -07:00
Mary Anthony 9e65afb02b Updating Dockerfile
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-10 21:07:10 -08:00
Jeffrey Morgan d45a012cbe Merge pull request #1441 from londoncalling/revert-1437-add-toolbox-overview
Revert "added toolbox overview"
2016-02-04 10:52:05 -08:00
Victoria 23875cb539 Revert "added toolbox overview" 2016-02-04 10:48:38 -08:00
Jeffrey Morgan be1cea9eef Merge branch 'master' of github.com:docker/kitematic 2016-02-04 10:25:24 -08:00
Jeffrey Morgan 33a3f4982d Bump version
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2016-02-04 10:25:06 -08:00
Jeffrey Morgan 26b8b63dcc Merge pull request #1437 from londoncalling/add-toolbox-overview
added toolbox overview
2016-02-04 10:16:49 -08:00
Jeffrey Morgan 45afe72962 Fix window size file loading on windows
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2016-02-04 10:13:25 -08:00
Victoria Bialas 2bdfb8f211 added toolbox overview
added keywords and weight to the metadata for menu placement

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-03 23:32:33 -08:00
French Ben 246990d5d1 Merge pull request #1430 from nathanleclaire/skip_precreate_fail_metric
Set 'Setup Halted' event instead of 'Setup Failed' for exit code 3
2016-02-02 17:01:29 -08:00
Nathan LeClaire a980a46687 Set 'Setup Halted' event instead of 'Setup Failed' for exit code 3
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-02-02 16:38:32 -08:00
Jeffrey Morgan 111ed736e9 Merge pull request #1432 from SvenDowideit/move-kitematic-into-toolbox-menu
Move Kitematic into the Docker Toolbox menu
2016-02-02 11:56:02 -08:00
Sven Dowideit 2762a02777 Move Kitematic into the Docker Toolbox menu
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-02-02 11:41:37 -08:00
Jeffrey Morgan 1d52da8705 Merge pull request #1408 from kelemen/master
Fix for #1403
2016-02-01 20:24:34 -08:00
Jeffrey Morgan c6924a0f8e Merge pull request #1418 from saiberz/master
Changes repo uri
2016-02-01 20:24:22 -08:00
Fredy Morales 47e0241e0b Changes repo uri
Signed-off-by: Fredy Morales <saiberz@hotmail.com>
2016-01-28 10:05:40 -05:00
Attila Kelemen 16bdc16dd3 Fixes #1403: PATH is wrong on Windows.
Signed-off-by: Attila Kelemen <attila.kelemen85@gmail.com>
2016-01-26 21:27:34 +01:00
Jeffrey Morgan 65584bdf20 Merge pull request #1371 from pra85/2016
Update year range to 2016
2016-01-26 10:52:03 -08:00
Prayag Verma d72145f618 Update copyright years
Signed-off-by: Prayag Verma <prayag.verma@gmail.com>
2016-01-22 10:07:01 +05:30
Jeffrey Morgan dd569065d8 Merge branch 'master' of github.com:docker/kitematic 2016-01-18 19:40:44 -08:00
Jeffrey Morgan 48b9be7ebf Bump version to 0.9.6
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2016-01-18 19:40:38 -08:00
Jeffrey Morgan d122fb9eb6 Merge pull request #1381 from docker/verify-vm
Properly verify that VM exists
2016-01-18 18:18:50 -08:00
Jeffrey Morgan afda9d49c4 Properly verify that VM exists
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2016-01-18 18:06:33 -08:00
Jeffrey Morgan 8ddff7740f Correct asset names on circleci
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2016-01-14 11:52:15 -08:00
Jeffrey Morgan ed6b8e9703 Better circleci versions
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2016-01-13 14:41:53 -08:00
Jeffrey Morgan 70e28a6ea1 Better circleci versions
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2016-01-13 14:34:16 -08:00
Jeffrey Morgan 1807681f73 Merge pull request #1340 from jeffdm/master
Fix bug where entry point would be repeated if no CMD was specified
2016-01-07 22:09:07 -05:00
Jeffrey Morgan 1b9a0484c0 Fix bug where entry point would be repeated if no CMD was specified 2016-01-01 21:18:10 -05:00
French Ben 9c9452213b Merge pull request #1322 from docker/latest-electron
Updated all electron calls for proper interactions - Tests pass 🎉
2015-12-28 13:46:42 -05:00
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