Merge pull request #55 from subutai-io/dev

Dev

DevEnvironment.md

@@ -6,7 +6,7 @@ If you don’t have grunt and bower installed, yet:
 
 and then get and build the sources:
 
-    git clone https://github.com/subutai-io/browsers.git
+    git clone https://github.com/subutai-io/browser-plugins.git
     cd browsers
     npm install && bower install && grunt
 

chrome/lib/porto-lib.js

@@ -116,7 +116,7 @@ define(function(require, exports, module) {
       that.ws.send(msg.cmd);
     }
     catch (err) {
-      callback({error: 'Couldn\'t send command to SubutaiTray'});
+      callback({error: 'Couldn\'t send command to Subutai Control Center'});
     }
   };
 

chrome/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_ext_name__",
-  "version": "4.1.0",
-  "version_name": "4.1.0",
+  "version": "4.2.0",
+  "version_name": "4.2.0",
   "description": "__MSG_ext_description__",
   "homepage_url":"https://subutai.io",
   "manifest_version": 2,

common/ui/inline/_e2e-button-template.html

@@ -24,6 +24,6 @@
 <!--<div class="ssh-plugin-info-tooltip">-->
   <!--<div style="padding-bottom: 10px" class="e2e-plugin-button-tooltip">EZ ssh access to your environment container, use it with ease,pz.-->
   <!--</div>-->
-  <!--<a href="https://github.com/subutai-io/browsers/releases/latest" target="_blank">Download</a>-->
+  <!--<a href="https://github.com/subutai-io/browser-plugins/releases/latest" target="_blank">Download</a>-->
 <!--</div>-->
 <!--</span>-->

common/ui/inline/hubTrayPort.js

@@ -34,7 +34,7 @@ porto.trayPort.intervalSSID = 0;
   });
 
   console.log("ORIGIN: " + origin);
-  if (origin.indexOf(".subut.ai") !== -1) {
+  if (origin.indexOf(".subut.ai") !== -1 || origin.indexOf(".subutai.io") !== -1) {
     porto.extension.sendMessage(
       {
         event: 'porto-socket-init',
@@ -101,7 +101,7 @@ porto.trayPort.intervalSSID = 0;
       var trayEmail = response.data;
       email = email.toLowerCase();
       trayEmail = trayEmail.toLowerCase();
-      console.log('tray email: ' + trayEmail);
+      console.log('Subutai Control Center email: ' + trayEmail);
       if (email === trayEmail) {
         var row = $(that.closest('tr'));
         var envName = $('.b-sidebar-profile-header-name').text().trim();
@@ -125,7 +125,7 @@ porto.trayPort.intervalSSID = 0;
       else {
         swal2({
           title: "Authentication error ",
-          text: "SubutaiTray and Hub user didn't match!?!?",
+          text: "Subutai Control Center and Bazaar user didn't match!?!?",
           type: "error",
           customClass: "b-warning"
         });
@@ -142,7 +142,7 @@ porto.trayPort.intervalSSID = 0;
       }
       else {
         swal2({
-          title: "Is SubutaiTray running?",
+          title: "Is Subutai Control Center running?",
           text: response.error,
           type: "error",
           customClass: "b-warning"
@@ -160,7 +160,7 @@ porto.trayPort.intervalSSID = 0;
     }, function(response) {
       if (response.error) {
         swal2({
-          title: "Is SubutaiTray running?",
+          title: "Is Subutai Control Center running?",
           text: response.error,
           type: "error",
           customClass: "b-warning"
@@ -202,7 +202,7 @@ porto.trayPort.intervalSSID = 0;
     }, function(response) {
       if (response.error) {
         swal2({
-          title: "Is SubutaiTray running?",
+          title: "Is Subutai Control Center running?",
           text: response.error,
           type: "error",
           customClass: "b-warning"

common/ui/inline/kurjunAgent.js

@@ -12,7 +12,7 @@ var porto = porto || {};
   var $addUserBtn = $('#add_user_btn');
 
   if (isKurjun === 'Kurjun' && $addUserBtn.length !== 0) {
-    console.log('This is kurjun');
+    console.log('This is Subutai CDN');
     $('body').on('click', '.bp-close-modal', function() {
       swal2.closeModal();
     });
@@ -74,7 +74,7 @@ var porto = porto || {};
        swal2({
          title: "Logged in",
          showConfirmButton: true,
-         text: "Your identity was successfully verified by Kurjun!",
+         text: "Your identity was successfully verified by Subutai CDN!",
          type: "success"
        }, function() {
          setTimeout(function() {

common/ui/inline/subutaiClient.js

@@ -313,15 +313,15 @@ porto.subutai.intervalSSID = 0;
       else {
         swal2({
           title: "Oh, snap error ",
-          text: "SubutaiTray and Hub user didn't match!?!?",
+          text: "Subutai Control Center and Bazaar user didn't match!?!?",
           type: "error",
           customClass: "b-warning"
         });
       }
     }
     else {
       swal2({
-        title: "Is SubutaiTray running?",
+        title: "Is Subutai Control Center running?",
         text: response.error,
         type: "error",
         customClass: "b-warning"
@@ -338,7 +338,7 @@ porto.subutai.intervalSSID = 0;
     }, function(response) {
       if (response.error) {
         swal2({
-          title: "Is SubutaiTray running?",
+          title: "Is Subutai Control Center running?",
           text: response.error,
           type: "error",
           customClass: "b-warning"

common/ui/popup.html

@@ -11,7 +11,7 @@
     <a href="https://subutai.io" rel="noreferrer" target="_blank"
        class="btn popupLogo btn-link btn-xs"></a><br>
     <a data-placement="bottom" data-toggle="tooltip"
-       href="https://github.com/subutai-io/browsers/wiki" target="_blank" rel="noreferrer"
+       href="https://github.com/subutai-io/browser-plugins/wiki" target="_blank" rel="noreferrer"
        class="btn btn-link btn-sm pull-right" data-l10n-title-id="popup_help_tooltip">
       <span class="glyphicon glyphicon-question-sign"></span><span data-l10n-id="popup_help"></span>
     </a>

e2e-plugin.safariextension/Info.plist

@@ -13,9 +13,9 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1.0</string>
+	<string>4.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>4.1.0</string>
+	<string>4.2.0</string>
 	<key>Chrome</key>
 	<dict>
 		<key>Global Page</key>

e2e-plugin.safariextension/lib/porto-lib.js

@@ -114,7 +114,7 @@ define(function(require, exports, module) {
       that.ws.send(msg.cmd);
     }
     catch (err) {
-      callback({error: 'Couldn\'t send command to SubutaiTray'});
+      callback({error: 'Couldn\'t send command to Subutai Control Center'});
     }
   };
 

edge/Extension/lib/porto-lib.js

@@ -117,7 +117,7 @@ define(function(require, exports, module) {
       that.ws.send(msg.cmd);
     }
     catch (err) {
-      callback({error: 'Couldn\'t send command to SubutaiTray'});
+      callback({error: 'Couldn\'t send command to Subutai Control Center'});
     }
   };
 

edge/appxmanifest.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
 <Package 
 	xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
 	xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
@@ -53,4 +53,4 @@
 			</Extensions>
 		</Application> 
 	</Applications>
-</Package>
+</Package>

firefox/lib/porto-lib.js

@@ -114,7 +114,7 @@ define(function(require, exports, module) {
       that.ws.send(msg.cmd);
     }
     catch (err) {
-      callback({error: 'Couldn\'t send command to SubutaiTray'});
+      callback({error: 'Couldn\'t send command to Subutai Control Center'});
     }
   };
 

firefox/manifest.json

@@ -6,7 +6,7 @@
     }
   },
   "name": "__MSG_ext_name__",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "__MSG_ext_description__",
   "homepage_url":"https://subutai.io",
   "manifest_version": 2,