Merge branch 'rc0.2.0' of github.com:kitematic/kitematic into rc0.2.0

index.js

@@ -127,7 +127,16 @@ app.on('ready', function() {
     }
 
     // Create the browser window.
-    mainWindow = new BrowserWindow({width: 800, height: 578, frame:false, resizable: false});
+    var windowOptions = {
+      width: 800,
+      height: 578,
+      frame: false,
+      resizable: false,
+      'web-preferences': {
+        'web-security': false
+      }
+    };
+    mainWindow = new BrowserWindow(windowOptions);
 
     // and load the index.html of the app.
     mainWindow.loadUrl(url);
@@ -135,4 +144,3 @@ app.on('ready', function() {
     mainWindow.focus();
   });
 });
-

meteor/client/lib/apputil.js

@@ -101,8 +101,8 @@ AppUtil.restart = function (appId) {
 
 AppUtil.remove = function (appId) {
   var app = Apps.findOne(appId);
+  Apps.remove({_id: appId});
   if (app.docker) {
-    Apps.remove({_id: appId});
     Docker.removeContainer(app.docker.Id, function (err) {
       if (err) { console.error(err); }
       var appPath = path.join(Util.KITE_PATH, app.name);

meteor/client/views/dashboard/apps/dashboard-single-app.html

@@ -22,11 +22,7 @@
       <small><a onclick="trackLink('app image detail')" href="/images/{{image._id}}">{{image.meta.name}}</a></small>
     </h5>
     <div class="options">
-      {{#if $eq status 'STOPPED'}}
-      <a href="#" onclick="trackLink('start app')" class="btn-icon btn-start" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Start App"><span class="typcn typcn-media-play-outline"></span></a>
-      {{/if}}
       {{#if $eq status 'READY'}}
-        <a href="#" onclick="trackLink('stop app')" class="btn-icon btn-stop" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Stop App"><span class="typcn typcn-media-stop"></span></a>
         {{#if url}}
           <a href="{{url}}" onclick="trackLink('view app')" class="btn-icon btn-view" target="_blank" data-toggle="tooltip" data-placement="bottom" title="View App"><span class="typcn typcn-eye-outline"></span></a>
         {{/if}}

meteor/client/views/dashboard/components/modal-create-app.js

@@ -14,7 +14,7 @@ Template.modal_create_app.events({
     var validationResult = formValidate(formData, FormSchema.formCreateApp);
     if (validationResult.errors) {
       clearFormErrors($form);
-      showFormErrors($form, validationResult.errors.details);
+      showFormErrors($form, validationResult.errors);
     } else {
       clearFormErrors($form);
       var cleaned = validationResult.cleaned;