aboutsummaryrefslogtreecommitdiffhomepage
path: root/resources
diff options
context:
space:
mode:
authorGravatar Hoà V. DINH <dinh.viet.hoa@gmail.com>2014-07-15 22:32:59 -0700
committerGravatar Hoà V. DINH <dinh.viet.hoa@gmail.com>2014-07-15 22:32:59 -0700
commit1c4906300f67bfd2f6d8f248659228863983bbc5 (patch)
treeda1f405d91b97d70b14df2bfa07ec8dc3fc588e2 /resources
parentcd9f04962fe6c49f8fff5daa591f5aa836f626bf (diff)
parent002afba1ab5de03824c8c773d18259830eec8de5 (diff)
Merge pull request #770 from foxinushka/master
Fixed DOCTYPE in MCHTMLCleaner
Diffstat (limited to 'resources')
-rw-r--r--resources/providers.json54
1 files changed, 53 insertions, 1 deletions
diff --git a/resources/providers.json b/resources/providers.json
index c43aae0d..6435914b 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",
@@ -904,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": "Корзина"
+ }
}
}