From 8a27d68b26eec0f85c16109f757caae5e38323f3 Mon Sep 17 00:00:00 2001
From: Viktor Gedzenko <foxinushka@gmail.com>
Date: Sun, 6 Jul 2014 18:36:20 +0300
Subject: Added hotmail & live domains to outlook provider

---
 resources/providers.json | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'resources')

diff --git a/resources/providers.json b/resources/providers.json
index 337a6e85..31e62799 100644
--- a/resources/providers.json
+++ b/resources/providers.json
@@ -840,7 +840,22 @@
             "outlook\\.es",
             "outlook\\.co\\.th",
             "outlook\\.com\\.tr",
-            "outlook\\.com\\.vn"
+            "outlook\\.com\\.vn",
+            "hotmail\\.com",
+            "hotmail\\.co\\.uk",
+            "hotmail\\.fr",
+            "hotmail\\.de",
+            "hotmail\\.be",
+            "hotmail\\.com\\.ar",
+            "hotmail\\.es",
+            "hotmail\\.com\\.mx",
+            "hotmail\\.com",
+            "live\\.com",
+            "live\\.fr",
+            "live\\.de",
+            "live\\.be",
+            "live\\.com\\.ar",
+            "live\\.com\\.mx"
         ],
         "mailboxes":{
             "drafts":"Drafts",
-- 
cgit v1.2.3


From 68f2bb15e4249d22f6e7d21c9af803d0dd8d164a Mon Sep 17 00:00:00 2001
From: Viktor Gedzenko <foxinushka@gmail.com>
Date: Mon, 7 Jul 2014 13:38:02 +0300
Subject: Added mail.ru provider

---
 resources/providers.json | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'resources')

diff --git a/resources/providers.json b/resources/providers.json
index 31e62799..09ed7628 100644
--- a/resources/providers.json
+++ b/resources/providers.json
@@ -919,5 +919,42 @@
             "sentmail": "Sent",
             "trash": "Trash"
         }
+    },
+    "mailru": {
+        "servers": {
+            "imap": [
+                     {
+                     "port": 143,
+                     "hostname": "imap.mail.ru",
+                     "starttls": true
+                     },
+                     {
+                     "port": 993,
+                     "hostname": "imap.mail.ru",
+                     "ssl": true
+                     }
+                     ],
+            "smtp": [
+                     {
+                     "port": 465,
+                     "hostname": "smtp.mail.ru",
+                     "ssl": true
+                     }
+                     ]
+            
+        },
+        "domain-match": [
+                         "mail\\.ru",
+                         "inbox\\.ru",
+                         "list\\.ru",
+                         "bk\\.ru",
+                         "mail\\.ua"
+                         ],
+        "mailboxes": {
+            "drafts": "Черновики",
+            "spam": "Спам",
+            "sentmail": "Отправленные",
+            "trash": "Корзина"
+        }
     }
 }
-- 
cgit v1.2.3