From b648f8d3a50aab85506ca22953a1709d8873a048 Mon Sep 17 00:00:00 2001 From: Danny Baumann Date: Thu, 13 Aug 2015 15:31:02 +0200 Subject: [PATCH 01/14] Update German translation. --- .../de/calExchangeCalendar.properties | 2 +- .../de/delegate-calendar-dialog.dtd | 6 +- .../exchangecalendar/de/delegate-folder.dtd | 70 +++++++++---------- .../exchangecalendar/de/exchangeSettings.dtd | 8 +-- .../de/exchangeSettingsOverlay.dtd | 2 +- .../exchangecalendar/de/manageEWSAccounts.dtd | 2 +- locale/exchangecalendar/de/rtews.dtd | 30 ++++---- .../de/timezonePreference.dtd | 2 +- 8 files changed, 61 insertions(+), 61 deletions(-) diff --git a/locale/exchangecalendar/de/calExchangeCalendar.properties b/locale/exchangecalendar/de/calExchangeCalendar.properties index 781cf174..9cb592b5 100644 --- a/locale/exchangecalendar/de/calExchangeCalendar.properties +++ b/locale/exchangecalendar/de/calExchangeCalendar.properties @@ -16,7 +16,7 @@ ewsMeetingResponsEventMessage=Besprechungsanfrage "%1$S" beantwortet mit "%2$S" ecErrorServerCheck=Fehler bei Abfrage des Servers:%1$S (%2$S) ecErrorAutodiscovery=Fehler bei Autodiscovery:%1$S (%2$S) -ecErrorAutodiscoveryURLInvalid=Die Postfacheinstellungen konnten nicht durch Autodiscovery mit dem Domainnamen des Postfachs ermittelt werden. (%1$S).\nNormalerweise bedeutet dies, dass kein Autodiscovery-Server mit dem Domainnamen als Hostnamen definiert ist. +ecErrorAutodiscoveryURLInvalid=Die Postfacheinstellungen konnten nicht durch Autodiscovery in der Domäne des Postfachs ermittelt werden. (%1$S).\nNormalerweise bedeutet dies, dass kein Autodiscovery-Server mit dem Name der Domäne als Hostname definiert ist. ecErrorServerCheckURLInvalid=Server "%1$S" existiert nicht. ecErrorServerAndMailboxCheck=Fehler bei der Abfrage des Servers und des Postfachs:%1$S (Code: %2$S) diff --git a/locale/exchangecalendar/de/delegate-calendar-dialog.dtd b/locale/exchangecalendar/de/delegate-calendar-dialog.dtd index 52eb16c2..760cf541 100644 --- a/locale/exchangecalendar/de/delegate-calendar-dialog.dtd +++ b/locale/exchangecalendar/de/delegate-calendar-dialog.dtd @@ -7,10 +7,10 @@ - + - - + + diff --git a/locale/exchangecalendar/de/delegate-folder.dtd b/locale/exchangecalendar/de/delegate-folder.dtd index 2ce88d16..cf59c8d1 100644 --- a/locale/exchangecalendar/de/delegate-folder.dtd +++ b/locale/exchangecalendar/de/delegate-folder.dtd @@ -1,45 +1,45 @@ - + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - + - - + + - - - - + + + + - - - - - - - - + + + + + + + + - - + + diff --git a/locale/exchangecalendar/de/exchangeSettings.dtd b/locale/exchangecalendar/de/exchangeSettings.dtd index 5a12403a..7189b21f 100644 --- a/locale/exchangecalendar/de/exchangeSettings.dtd +++ b/locale/exchangecalendar/de/exchangeSettings.dtd @@ -44,8 +44,8 @@ - - - - + + + + diff --git a/locale/exchangecalendar/de/exchangeSettingsOverlay.dtd b/locale/exchangecalendar/de/exchangeSettingsOverlay.dtd index c1790510..2e86f2e2 100644 --- a/locale/exchangecalendar/de/exchangeSettingsOverlay.dtd +++ b/locale/exchangecalendar/de/exchangeSettingsOverlay.dtd @@ -41,7 +41,7 @@ - + diff --git a/locale/exchangecalendar/de/manageEWSAccounts.dtd b/locale/exchangecalendar/de/manageEWSAccounts.dtd index b3ac5336..ab937944 100644 --- a/locale/exchangecalendar/de/manageEWSAccounts.dtd +++ b/locale/exchangecalendar/de/manageEWSAccounts.dtd @@ -7,7 +7,7 @@ - + diff --git a/locale/exchangecalendar/de/rtews.dtd b/locale/exchangecalendar/de/rtews.dtd index b60f11fd..00af607b 100755 --- a/locale/exchangecalendar/de/rtews.dtd +++ b/locale/exchangecalendar/de/rtews.dtd @@ -1,15 +1,15 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/locale/exchangecalendar/de/timezonePreference.dtd b/locale/exchangecalendar/de/timezonePreference.dtd index a61aa649..e0dd46ac 100644 --- a/locale/exchangecalendar/de/timezonePreference.dtd +++ b/locale/exchangecalendar/de/timezonePreference.dtd @@ -1 +1 @@ - + From 065bb4dcacbc2696d4424e9e80c8396c3500dc29 Mon Sep 17 00:00:00 2001 From: Babu Vincent Date: Wed, 19 Aug 2015 11:23:02 +0530 Subject: [PATCH 02/14] Password loop fix - allow user enter domain\user --- chrome/content/exchangeSettingsOverlay.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/chrome/content/exchangeSettingsOverlay.js b/chrome/content/exchangeSettingsOverlay.js index dbcf5965..92e2f1ba 100644 --- a/chrome/content/exchangeSettingsOverlay.js +++ b/chrome/content/exchangeSettingsOverlay.js @@ -239,12 +239,12 @@ exchSettingsOverlay.prototype = { this._document.getElementById("exchWebService_windowsdomain").disabled = true; this._document.getElementById("exchWebService_windowsdomain").value = ""; //this._document.getElementById("exchWebService_windowsdomain").setAttribute("required", false); - this.exchWebServicesgDomain = ""; + this.exchWebServicesgDomain = ""; - if(this.exchWebServicesgUser.indexOf("\\") > -1){ - var newArray = this.exchWebServicesgUser.split("\\"); - this.exchWebServicesgUser = newArray[1]; - this.exchWebServicesgDomain = newArray[0]; + if(this.exchWebServicesgUser.indexOf("\\") > -1){ + var username = this.exchWebServicesgUser; + this.exchWebServicesgUser =username.substr(0,username.indexOf("\\")); + this.exchWebServicesgDomain = username.substr(username.indexOf("\\") +1); } } else { From cf32c52a96150d164713a7ed58b4398de4cde3ae Mon Sep 17 00:00:00 2001 From: github user Date: Wed, 19 Aug 2015 11:40:25 +0530 Subject: [PATCH 03/14] Password loop fix: donot use domain from email --- .../exchangeAuthPrompt2/mivExchangeAuthPrompt2.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js index 63f88617..90dfe515 100644 --- a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js +++ b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js @@ -371,17 +371,15 @@ mivExchangeAuthPrompt2.prototype = { authInfo.username = username.substr(username.indexOf("\\")+1); this.logInfo("asyncPromptAuthNotifyCallback: We have a domainname part in the username. Going to use it. domain="+authInfo.domain); } - else { - if (username.indexOf("@") > -1) { - authInfo.username = username.substr(0,username.indexOf("@")); - authInfo.domain = username.substr(username.indexOf("@")+1); + else if (username.indexOf("@") > -1) { + authInfo.username = username; + authInfo.domain = undefined; this.logInfo("asyncPromptAuthNotifyCallback: We have a domainname part in the username. Going to use it. domain="+authInfo.domain); - } - else { + } + else { this.logInfo("asyncPromptAuthNotifyCallback: We do not have a domainname part in the username. Specifying empty one."); authInfo.username = username; - } - } + } } else { authInfo.username = username; From 06f1ca54f796fa0486b2db49db7779894ed7af19 Mon Sep 17 00:00:00 2001 From: Babu Vincent Date: Wed, 19 Aug 2015 11:41:41 +0530 Subject: [PATCH 04/14] Password loop fix: undefined server not found --- interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js index 90dfe515..d862e6b3 100644 --- a/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js +++ b/interfaces/exchangeAuthPrompt2/mivExchangeAuthPrompt2.js @@ -373,7 +373,7 @@ mivExchangeAuthPrompt2.prototype = { } else if (username.indexOf("@") > -1) { authInfo.username = username; - authInfo.domain = undefined; + authInfo.domain = ""; this.logInfo("asyncPromptAuthNotifyCallback: We have a domainname part in the username. Going to use it. domain="+authInfo.domain); } else { From 70ce7c0150c0b7ab295b39b8a755ff7974148a8c Mon Sep 17 00:00:00 2001 From: Babu Vincent Date: Thu, 20 Aug 2015 15:52:09 +0530 Subject: [PATCH 05/14] Make Followup task configurable . #313 --- chrome/content/exchangeSettings.js | 14 ++++- chrome/content/exchangeSettings.xul | 15 ++++- .../exchangeCalendar/mivExchangeCalendar.js | 59 ++++++++++++------- .../en-US/exchangeSettings.dtd | 4 +- 4 files changed, 65 insertions(+), 27 deletions(-) diff --git a/chrome/content/exchangeSettings.js b/chrome/content/exchangeSettings.js index 407592d4..5b114f82 100644 --- a/chrome/content/exchangeSettings.js +++ b/chrome/content/exchangeSettings.js @@ -267,11 +267,17 @@ exchExchangeSettings.prototype = { this._document.getElementById("exchWebService-syncMailItems-Interval").value = this.globalFunctions.safeGetIntPref(exchWebServicesCalPrefs, "syncMailItems.Interval", 15); this._document.getElementById("exchWebService-syncMailItems-active").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "mailsync.active",false); + this._document.getElementById("exchWebService-followup-deactivtate").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "followup.task.deactivate",false); if ( this.globalFunctions.safeGetCharPref(exchWebServicesCalPrefs, "ecFolderbase", "") == "calendar" ){ - this._document.getElementById("mailItemsPropertiesTab").hidden = false; + this._document.getElementById("exchWebService-mail-properties-calendar").hidden = false; + this._document.getElementById("exchWebService-mail-properties-task").hidden = true; } + else{ + this._document.getElementById("exchWebService-mail-properties-calendar").hidden = true; + this._document.getElementById("exchWebService-mail-properties-task").hidden = false; + } /* this._document.getElementById("exchWebService-poll-inbox").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecPollInbox", true); @@ -337,7 +343,11 @@ exchExchangeSettings.prototype = { exchWebServicesCalPrefs.setIntPref("syncMailItems.Interval", this._document.getElementById("exchWebService-syncMailItems-Interval").value); exchWebServicesCalPrefs.setBoolPref("mailsync.active", this._document.getElementById("exchWebService-syncMailItems-active").checked); } - + else{ + //Add items releted to Task here these will be taken only when task calendar changes + exchWebServicesCalPrefs.setBoolPref("followup.task.deactivate", this._document.getElementById("exchWebService-followup-deactivtate").checked); + } + //exchWebServicesCalPrefs.setBoolPref("ecPollInbox", this._document.getElementById("exchWebService-poll-inbox").checked); exchWebServicesCalPrefs.setIntPref("ecCalendarPollInterval", this._document.getElementById("exchWebService-poll-calendar-interval").value); diff --git a/chrome/content/exchangeSettings.xul b/chrome/content/exchangeSettings.xul index af0b5761..27bff534 100644 --- a/chrome/content/exchangeSettings.xul +++ b/chrome/content/exchangeSettings.xul @@ -77,7 +77,7 @@ -