Commit Graph

25 Commits

Author SHA1 Message Date
Jeffrey Morgan b9cb2e5fe5 Merge branch 'master' into revert-382-revert-374-hub-button 2015-04-27 09:45:31 -04:00
Jeffrey Morgan 4199dc2e6a Merge branch 'master' into revert-382-revert-374-hub-button 2015-04-22 21:04:41 -04:00
Jeffrey Morgan d45ccdc005 Adding source maps to tests for better stack traces 2015-04-22 11:56:46 -04:00
Jeffrey Morgan a0a58dd0ac Remove react processing 2015-04-21 19:58:38 -04:00
Jeffrey Morgan 7031814cc4 Include boot2docker iso in distribution 2015-04-20 10:43:31 -04:00
Jeffrey Morgan 98000359ba bumping to 0.5.14 with docker 1.6 2015-04-16 16:29:18 -04:00
Jeffrey Morgan c02a037190 Revert "Revert "Adding Custom URL Handler for running containers" for 1.6 release" 2015-04-16 14:54:40 -04:00
Jeffrey Morgan 61a03c3a7d Revert "Adding Custom URL Handler for running containers" 2015-04-16 13:58:07 -04:00
Jeffrey Morgan 9e2c11f6d0 Changing protocol to Docker 2015-03-18 11:51:59 -07:00
Jeffrey Morgan 4a5162ba23 Merge branch 'master' into hub-button 2015-03-17 13:31:57 -07:00
Jeffrey Morgan bc7438d946 Fixing npm install 2015-03-14 14:18:43 -04:00
Jeffrey Morgan e92678508b WIP button 2015-03-11 18:43:19 -04:00
Jeffrey Morgan 71a15af401 Bump custom machine version 2015-03-06 18:25:15 -05:00
Jeffrey Morgan 99bca9f29f Updating plist 2015-03-06 13:22:47 -05:00
Jeffrey Morgan 58af2f4e9b Bumping version, atom-shell 2015-03-06 13:19:05 -05:00
Jeffrey Morgan fa8f55cc14 Bump version for custom machine 2015-03-05 21:41:30 -05:00
Jeffrey Morgan 2760b56574 Regenerate certificates on startup, fix permissions bug 2015-03-05 21:09:06 -05:00
Jeffrey Morgan 9b32a6a680 0.5.3 setup stability, errors & retrying 2015-03-01 17:08:46 -05:00
Jeffrey Morgan 1ce936578b Updating Icons 2015-02-28 11:18:22 -05:00
Jeffrey Morgan ea31632588 Fix auto updates 2015-02-27 23:22:50 -05:00
Jeffrey Morgan d52810959a Fixing merges 2015-02-26 20:16:48 -05:00
Jeffrey Morgan 75467305df Merge branch 'master' into machine
Conflicts:
	util/deps
2015-02-26 20:15:01 -05:00
Jeffrey Morgan b5bd6803d6 Working version of machine 2015-02-26 20:14:43 -05:00
Jeffrey Morgan 25302cc1a9 Merge branch 'master' into machine
Conflicts:
util/deps
2015-02-26 16:18:26 -05:00
Jeffrey Morgan e3d9de2d70 Clean test files, binaries 2015-02-26 13:58:30 -05:00