From b4b94fda1f22e5443537fde39a91fecdbfdfd91f Mon Sep 17 00:00:00 2001
From: coldad <info@coldad.com>
Date: Tue, 11 Nov 2025 19:58:55 -0500
Subject: [PATCH 1/6] Adding nili.ca

---
 ispdb/nili.ca.xml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 ispdb/nili.ca.xml

diff --git a/ispdb/nili.ca.xml b/ispdb/nili.ca.xml
new file mode 100644
index 0000000..fdfb080
--- /dev/null
+++ b/ispdb/nili.ca.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="nili.ca">
+    <domain>nili.ca</domain>
+    <displayName>Nili Mail</displayName>
+    <displayShortName>Nili</displayShortName>
+
+    <incomingServer type="imap">
+      <hostname>email.nili.email</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+
+    <outgoingServer type="smtp">
+      <hostname>email.nili.email</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+
+    <webMail>
+      <loginPage url="https://webmail.nili.ca/"/>
+    </webMail>
+
+    <!-- Optional: document your help page(s) for maintainers -->
+     <documentation url="https://nili.ca/knowledge-base/how-to-connect-email-clients-to-servers/">
+      <descr lang="en">POP, IMAP, and SMTP settings for Nili</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>

From 9f4a161442bb9ed36deaab2f6d98f87d7f149d2a Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <brendan@thunderbird.net>
Date: Fri, 27 Feb 2026 16:18:20 +0000
Subject: [PATCH 2/6] Run convert.py on pull requests

---
 .github/workflows/validate-config.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/validate-config.yml b/.github/workflows/validate-config.yml
index d41af32..e3f5dcb 100644
--- a/.github/workflows/validate-config.yml
+++ b/.github/workflows/validate-config.yml
@@ -32,3 +32,8 @@ jobs:
         run: |
           pip install lxml
           python tools/validate.py ispdb/*
+
+      - name: Run convert.py
+        run: |
+          mkdir tmp/
+          python tools/convert.py -a -d tmp/ ispdb/*

From 22298fc35f2e25319cb3d86003174267b25b286a Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <brendan@thunderbird.net>
Date: Mon, 9 Mar 2026 10:00:28 +0100
Subject: [PATCH 3/6] Add CODEOWNERS file for automated review requests

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..d2eafaf
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @thunderbird/autoconfig-reviewers

From 7d6b6e05af3f1c1d67faece87c6429e15933ec64 Mon Sep 17 00:00:00 2001
From: Eleanor Dicharry <edicharry@thunderbird.net>
Date: Tue, 20 Jan 2026 15:59:49 -0700
Subject: [PATCH 4/6] Add `graph` incoming server type for Office365.

---
 ispdb/office365.com.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ispdb/office365.com.xml b/ispdb/office365.com.xml
index e37e142..6d1652e 100644
--- a/ispdb/office365.com.xml
+++ b/ispdb/office365.com.xml
@@ -25,6 +25,22 @@
         <leaveMessagesOnServer>true</leaveMessagesOnServer>
       </pop3>
     </incomingServer>
+    <incomingServer type="ews">
+      <username>%EMAILADDRESS</username>
+      <authentication>OAuth2</authentication>
+      <url>https://outlook.office365.com/ews/exchange.asmx</url>
+    </incomingServer>
+    <incomingServer type="owa">
+      <username>%EMAILADDRESS</username>
+      <authentication>OAuth2</authentication>
+      <url>https://outlook.office365.com/owa/</url>
+    </incomingServer>
+    <incomingServer type="graph">
+      <username>%EMAILADDRESS%</username>
+      <authentication>OAuth2</authentication>
+      <url>https://graph.microsoft.com/v1.0</url>
+    </incomingServer>
+    <!-- Backwards compatibility with single Exchange incomingServer element. -->
     <incomingServer type="exchange">
       <hostname>outlook.office365.com</hostname>
       <port>443</port>

From 1daa57ba52334b754a020511385f1c3356d1d607 Mon Sep 17 00:00:00 2001
From: Eleanor Dicharry <edicharry@thunderbird.net>
Date: Tue, 10 Mar 2026 09:27:58 -0600
Subject: [PATCH 5/6] Use unversioned base URI for Graph API.

---
 ispdb/office365.com.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ispdb/office365.com.xml b/ispdb/office365.com.xml
index 6d1652e..ef0346f 100644
--- a/ispdb/office365.com.xml
+++ b/ispdb/office365.com.xml
@@ -38,7 +38,7 @@
     <incomingServer type="graph">
       <username>%EMAILADDRESS%</username>
       <authentication>OAuth2</authentication>
-      <url>https://graph.microsoft.com/v1.0</url>
+      <url>https://graph.microsoft.com/</url>
     </incomingServer>
     <!-- Backwards compatibility with single Exchange incomingServer element. -->
     <incomingServer type="exchange">

From 55bc894dcef9fbc7fcebfc218889d80801befe18 Mon Sep 17 00:00:00 2001
From: coldad <info@coldad.com>
Date: Tue, 10 Mar 2026 13:26:22 -0400
Subject: [PATCH 6/6] Update Nili email provider configuration

---
 ispdb/nili.ca.xml | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/ispdb/nili.ca.xml b/ispdb/nili.ca.xml
index fdfb080..c37a369 100644
--- a/ispdb/nili.ca.xml
+++ b/ispdb/nili.ca.xml
@@ -2,8 +2,8 @@
 <clientConfig version="1.1">
   <emailProvider id="nili.ca">
     <domain>nili.ca</domain>
-    <displayName>Nili Mail</displayName>
-    <displayShortName>Nili</displayShortName>
+    <displayName>Nili</displayName>
+    <displayNameShort>Nili</displayNameShort>
 
     <incomingServer type="imap">
       <hostname>email.nili.email</hostname>
@@ -13,6 +13,22 @@
       <authentication>password-cleartext</authentication>
     </incomingServer>
 
+    <incomingServer type="pop3">
+      <hostname>email.nili.email</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+
+    <outgoingServer type="smtp">
+      <hostname>email.nili.email</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+
     <outgoingServer type="smtp">
       <hostname>email.nili.email</hostname>
       <port>587</port>
@@ -21,12 +37,7 @@
       <authentication>password-cleartext</authentication>
     </outgoingServer>
 
-    <webMail>
-      <loginPage url="https://webmail.nili.ca/"/>
-    </webMail>
-
-    <!-- Optional: document your help page(s) for maintainers -->
-     <documentation url="https://nili.ca/knowledge-base/how-to-connect-email-clients-to-servers/">
+    <documentation url="https://nili.ca/knowledge-base/how-to-connect-email-clients-to-servers/">
       <descr lang="en">POP, IMAP, and SMTP settings for Nili</descr>
     </documentation>
   </emailProvider>