Commit Graph

1469 Commits

Author SHA1 Message Date
Jeffrey Morgan a232108dd3 Merge branch 'master' into windows 2015-06-09 23:18:12 -07:00
Jeffrey Morgan 5048d16e22 OS X zip 2015-06-09 23:17:49 -07:00
Jeffrey Morgan c53400fb90 Fix signing 2015-06-09 22:27:27 -07:00
Jeffrey Morgan 1263a8c4fe Fix icon on mac os x 2015-06-09 21:54:11 -07:00
Jeffrey Morgan 1552d09957 Accounting for settings.json 2015-06-09 20:49:26 -07:00
Jeffrey Morgan 47beaee0c8 Removing unnecessary console log in Gruntfile 2015-06-09 20:44:25 -07:00
Jeffrey Morgan 8f465c1a8c Separate Mac OS X and Windows tasks 2015-06-09 20:35:46 -07:00
Jeffrey Morgan 7c67548fc6 Fix bug where SIGTERMing grunt would not stop Electron 2015-06-09 20:26:05 -07:00
Jeffrey Morgan 05e32dc3e5 Bump machine version to 0.3.0 rc2 2015-06-09 17:57:17 -07:00
Jeffrey Morgan 5f8776c0ee Adding mac os x 2015-06-09 17:56:08 -07:00
Jeffrey Morgan 140ae4671b Installer & dist for windows 2015-06-09 17:16:00 -07:00
Jeffrey Morgan a3ca2217e1 Adding gruntfile for better compatibility with electron community 2015-06-08 19:36:59 -07:00
Jeffrey Morgan 85fc0a6eda Fixed bug where error dialog would appear if app was closed via taskbar 2015-06-08 15:34:54 -07:00
Jeffrey Morgan 4d5b9861dd Fixed bug where the VirtualBox shared folder would attempt to be created twice on Windows 2015-06-08 15:33:46 -07:00
Jeffrey Morgan d3c433a5d7 Merge branch 'master' of github.com:kitematic/kitematic 2015-06-08 13:04:37 -07:00
Jeffrey Morgan 95993a7ffb Fixed bug where error would not show if fetching recommended repos failed 2015-06-08 13:04:31 -07:00
Jeffrey Morgan 92ac095c03 Merge pull request #597 from VojtechBartos/master
Fixing setting up custom shell in container terminal
2015-06-07 23:09:16 -07:00
Jeffrey Morgan 72d4e21a34 Fixed bug where packaging binaries would fail on release 2015-06-05 21:34:44 -07:00
Jeffrey Morgan a896f606f1 Merge pull request #604 from kitematic/fix-17rc2
Fixed bug with API requests to 1.7 RC2 /containers/create endpoint
2015-06-05 21:25:13 -07:00
Jeffrey Morgan cc0bc719fa Removing unnecessary print statement 2015-06-05 21:23:14 -07:00
Jeffrey Morgan bf7d3af402 Fixed bug with API requests to 1.7 RC2 /containers/create endpoint 2015-06-05 21:22:34 -07:00
Jeffrey Morgan a311669588 Merge pull request #596 from kitematic/windows
Change npm & setup scripts to work with windows again
2015-06-05 16:47:14 -07:00
Jeffrey Morgan 103af8b530 Fix windows volume mounting 2015-06-05 16:43:26 -07:00
Jeffrey Morgan 1a88216e2e Windows fonts 2015-06-05 16:41:43 -07:00
Jeffrey Morgan 1efdb51322 Merge branch 'master' of github.com:kitematic/kitematic 2015-06-05 11:00:22 -07:00
Jeffrey Morgan 577858f9a1 Fixed docs to no longer mention copying binaries 2015-06-05 10:56:38 -07:00
Vojta Bartos 4b708f2275 Making condition simple
- removed checking for undefined, not necessary
2015-06-05 19:49:18 +02:00
Jeffrey Morgan 340e7574dc Merge pull request #601 from TeckniX/use-document-folder
Moved Kitematic dir to Documents
2015-06-05 09:40:05 -07:00
TeckniX 3cede9eb74 Moved Kitematic dir to Documents
Signed-off-by: TeckniX <lokitek@gmail.com>
2015-06-05 11:10:10 -04:00
Vojta Bartos 955a43a14d Fix bug where we want to set custom shell
- at container details sub header
- tried to access to array like object
- added reduce function to make array object
2015-06-05 10:11:04 +02:00
Jeffrey Morgan 6f7d9b80e7 Reverting DockerUtil.js 2015-06-04 23:08:52 -07:00
Jeffrey Morgan 3a52e1c3f2 Mock the remote module 2015-06-04 22:12:18 -07:00
Jeffrey Morgan cefd299604 Fix integration tests 2015-06-04 20:16:13 -07:00
Jeffrey Morgan 9628a00ab2 Update CONTRIBUTING.md 2015-06-04 20:14:23 -07:00
Jeffrey Morgan 42b6271a34 Update CONTRIBUTING.md 2015-06-04 20:13:34 -07:00
Jeffrey Morgan 7d0d63e5c3 Update CONTRIBUTING.md 2015-06-04 20:13:21 -07:00
Jeffrey Morgan aa9aa696ff Fix file downloads 2015-06-04 19:47:44 -07:00
Jeffrey Morgan 47967507dc Windows installer 2015-06-04 19:25:22 -07:00
Jeffrey Morgan 94113feaed Do not save sourcemaps 2015-06-04 19:16:43 -07:00
Jeffrey Morgan 44412ad26a Use babel-jest to preprocess test files 2015-06-04 19:15:22 -07:00
Jeffrey Morgan 4d82006b57 Fixed bug where an error pulling repos would instead show an unrelated 404 error 2015-06-04 19:08:41 -07:00
Jeffrey Morgan ce2452bffd Move binary download code to gulp 2015-06-04 18:10:06 -07:00
Jeffrey Morgan 7b507067e9 Fixed bug where react.js would be loaded twice on windows 2015-06-04 18:00:11 -07:00
Jeffrey Morgan c43a8d5a69 Adding errors for non-200 api responses 2015-06-02 11:23:12 -07:00
Jeffrey Morgan 71985eaf0f Merge pull request #570 from kitematic/fix-terminal-clear
Fix bug where open terminal commands would not clear
2015-05-31 18:04:56 -07:00
Jeffrey Morgan bd1877688d Merge pull request #571 from kitematic/fix-scrub
Fix bug where scrubbing system usernames would accidentally scrub entire paths
2015-05-31 15:47:41 -07:00
Jeffrey Morgan bb66ec5a99 Merge pull request #569 from kitematic/include-compose
Adding compose binary to kitematic
2015-05-31 15:47:27 -07:00
Jeffrey Morgan 161b35fd44 Fix bug where scrubbing system usernames would accidentally scrub entire paths 2015-05-31 01:32:38 -07:00
Jeffrey Morgan cc29437e09 Fix bug where terminal command would be printed on click Docker CLI button or Terminal into container button 2015-05-31 01:30:07 -07:00
Jeffrey Morgan bda32c5b39 Adding compose binary to kitematic 2015-05-31 01:27:29 -07:00