Merge branch 'dev/sockets'

Gruntfile.js

@@ -518,7 +518,7 @@ module.exports = function(grunt) {
     grunt.registerTask('manifest-dev', function() {
         patchManifest({
             suffix: ' (DEV)',
-            version: '9999.9999.9999.9999'
+            version: '9999.9999.9999'
         });
     });
     grunt.registerTask('manifest-test', function() {

package.json

@@ -37,14 +37,14 @@
         "axe-logger": "~0.0.2",
         "crypto-lib": "~0.2.1",
         "dompurify": "~0.4.2",
-        "imap-client": "~0.4.3",
+        "imap-client": "~0.5.0",
         "jquery": "~2.1.1",
         "mailreader": "~0.4.0",
         "ng-infinite-scroll": "~1.1.2",
         "pgpbuilder": "~0.5.0",
-        "pgpmailer": "~0.5.0",
+        "pgpmailer": "~0.7.0",
-        "tcp-socket": "~0.3.13",
+        "tcp-socket": "~0.4.0",
-        "wo-smtpclient": "^0.3.8",
+        "wo-smtpclient": "~0.5.0",
         "angularjs": "https://github.com/whiteout-io/angular.js/tarball/npm-version",
         "browsercrow": "https://github.com/whiteout-io/browsercrow/tarball/master",
         "browsersmtp": "https://github.com/whiteout-io/browsersmtp/tarball/master",

src/manifest.json

@@ -23,6 +23,11 @@
       ]
     }
   ],
+  "sockets": {
+    "tcp": {
+      "connect": ""
+    }
+  },
   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBXqC3/oX5fP/gLORcVN62Pf3Ph+pO4qEB+FynSMWMoqWUt7FDoaKuHrsP/KInuP/0PUZcqpij9kB9MytLTqYzGIoRsUd37i1Dt6R69fnNsIqAISgoWIRg4VyRdon9cTIniv3DVV45PPyNCvN+oQoBMv9NbojWnlL9W05bKYkABQIDAQAB",
   "oauth2": {
     "client_id": "440907777130.apps.googleusercontent.com",

src/tpl/login-set-credentials.html

@@ -33,7 +33,7 @@
         <fieldset>
           <legend>IMAP</legend>
           <div>
-            <input required ng-disabled="hasProviderPreset" class="input-text" type="text" ng-model="imapHost" placeholder="Host" pattern="^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$"></input>
+            <input required ng-disabled="hasProviderPreset" class="input-text" type="text" ng-model="imapHost" placeholder="Host" pattern="^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></input>
             <input required ng-disabled="hasProviderPreset" class="input-text" type="number" ng-model="imapPort" placeholder="Port" min="0" max="65535" step="1" pattern="\d+"></input>
           </div>
           <label>
@@ -49,7 +49,7 @@
         <fieldset>
           <legend>SMTP</legend>
           <div>
-            <input required ng-disabled="hasProviderPreset" class="input-text" type="text" ng-model="smtpHost" placeholder="Host" pattern="^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$"></input>
+            <input required ng-disabled="hasProviderPreset" class="input-text" type="text" ng-model="smtpHost" placeholder="Host" pattern="^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></input>
             <input required ng-disabled="hasProviderPreset" class="input-text" type="number" ng-model="smtpPort" placeholder="Port" min="0" max="65535" step="1" pattern="\d+"></input>
           </div>
           <label>