commit ce74e0c031df621fe7daf3318b81325b07890041 Author: Vu Quoc Huy <huyvq.c633@gmail.com> Date: Fri Mar 31 16:00:00 2017 -0400 Hide the timestamp and account from message selection templates * And set use_utc_timezone to false. * Closes trac 21736 and 17619 --- ChangeLog | 1 + .../0001-Set-Tor-Messenger-preferences.patch | 31 +++++------ ...c-21634-Autologin-default-should-be-false.patch | 4 +- ...Support-Special-Characters-input-prompt-o.patch | 4 +- ...Better-error-reporting-for-failed-outgoin.patch | 4 +- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 4 +- ...-Fix-tab-strip-background-colour-on-OS-X..patch | 4 +- ...-XMPP-createConversation-should-handle-in.patch | 4 +- .../0008-XMPP-in-band-registration.patch | 4 +- .../instantbird/0009-Remove-search-from-UI.patch | 4 +- .../0010-Add-Tor-Messenger-branding.patch | 4 +- projects/instantbird/0011-Account-picture.patch | 4 +- .../0012-Modify-protocol-defaults.patch | 4 +- .../instantbird/0013-Modify-IRC-defaults.patch | 4 +- projects/instantbird/0014-Modify-themes.patch | 4 +- .../instantbird/0015-Modify-XMPP-defaults.patch | 4 +- projects/instantbird/0016-Remove-logging-UI.patch | 4 +- projects/instantbird/0017-Cert-override.patch | 4 +- .../0018-Display-all-traffic-over-Tor.patch | 4 +- .../instantbird/0019-Trac-17480-Content-sink.patch | 4 +- .../0020-SASL-ECDSA-NIST256P-CHALLENGE.patch | 4 +- ...-msg-is-not-defined-error-in-irc.js-chang.patch | 4 +- ...Contact-list-entries-should-adapt-their-h.patch | 4 +- ...1187281-Only-show-close-button-on-Windows.patch | 4 +- ...-Remove-old-Yahoo-Messenger-support.-r-al.patch | 4 +- ...-Use-built-in-functions-instead-of-an-svg.patch | 4 +- ...-Add-a-pref-to-disable-JavaScript-in-brow.patch | 4 +- ...517-Use-different-color-for-Add-Exception.patch | 4 +- ...21736-Hide-account-timestamp-from-message.patch | 64 ++++++++++++++++++++++ projects/instantbird/config | 1 + 30 files changed, 133 insertions(+), 68 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56768c1..aa9197d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ Tor Messenger 0.4.0b3 -- * All Platforms * Add some missing localization for Twitter's actions + * Trac 21736: Hide the timestamp and account from message selection templates Tor Messenger 0.4.0b2 -- March 31, 2017 * All Platforms diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index fc8da85..9a72cd6 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,17 +1,17 @@ -From fb5f313361c15285152d6e3f25a428e60f8d1679 Mon Sep 17 00:00:00 2001 +From 8db9ea380fb0d2b54bb3dd6d6003532d13d2c2bf Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir@torproject.org> Date: Mon, 10 Oct 2016 19:48:41 -0700 -Subject: [PATCH 01/27] Set Tor Messenger preferences +Subject: [PATCH 01/28] Set Tor Messenger preferences --- - im/app/profile/all-instantbird.js | 425 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 403 insertions(+), 22 deletions(-) + im/app/profile/all-instantbird.js | 424 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 402 insertions(+), 22 deletions(-) diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index b7a397017..7b91410f9 100644 +index b7a397017..89593abeb 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js -@@ -1,3 +1,54 @@ +@@ -1,3 +1,53 @@ +/** + * This file is divded into three section, + * @@ -62,11 +62,10 @@ index b7a397017..7b91410f9 100644 +pref("app.update.download.backgroundInterval", 60); + + -+ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -@@ -28,7 +79,7 @@ pref("general.autoScroll", true); +@@ -28,7 +78,7 @@ pref("general.autoScroll", true); // 0 = spellcheck nothing // 1 = check multi-line controls [default] // 2 = check multi/single line controls @@ -75,7 +74,7 @@ index b7a397017..7b91410f9 100644 pref("messenger.accounts.convertOldPasswords", true); pref("messenger.accounts.promptOnDelete", true); -@@ -66,7 +117,7 @@ pref("extensions.mintrayr.singleClickRestore", false); +@@ -66,7 +116,7 @@ pref("extensions.mintrayr.singleClickRestore", false); // Whether message related sounds should be played at all. If this is enabled // then the more specific prefs are checked as well. @@ -84,7 +83,7 @@ index b7a397017..7b91410f9 100644 // Specifies whether each message event should trigger a sound for incoming // and outgoing messages, or when your nickname is mentioned in a chat. pref("messenger.options.playSounds.outgoing", true); -@@ -142,26 +193,23 @@ pref("app.update.staging.enabled", true); +@@ -142,26 +192,23 @@ pref("app.update.staging.enabled", true); // Update service URL: // You do not need to use all the %VAR% parameters. Use what you need, %PRODUCT%,%VERSION%,%BUILD_ID%,%CHANNEL% for example @@ -116,7 +115,7 @@ index b7a397017..7b91410f9 100644 // Interval: Time before prompting the user to restart to install the latest // download (in seconds) default=30 minutes -@@ -202,7 +250,7 @@ pref("browser.search.order.1", "chrome://instantbird/locale/regio +@@ -202,7 +249,7 @@ pref("browser.search.order.1", "chrome://instantbird/locale/regio pref("browser.search.order.2", "chrome://instantbird/locale/region.properties"); // send ping to the server to update @@ -125,7 +124,7 @@ index b7a397017..7b91410f9 100644 // disable logging for the search service update system by default pref("browser.search.update.log", false); -@@ -222,10 +270,10 @@ pref("extensions.ignoreMTimeChanges", false); +@@ -222,10 +269,10 @@ pref("extensions.ignoreMTimeChanges", false); pref("extensions.logging.enabled", false); pref("general.skins.selectedSkin", "classic/1.0"); @@ -138,7 +137,7 @@ index b7a397017..7b91410f9 100644 // Preferences for the Get Add-ons pane pref("extensions.getAddons.cache.enabled", false); -@@ -244,10 +292,24 @@ pref("extensions.getMoreMessageStylesURL", "https://add-ons.instantbird.org/%LOC +@@ -244,10 +291,24 @@ pref("extensions.getMoreMessageStylesURL", "https://add-ons.instantbird.org/%LOC pref("extensions.getMoreEmoticonsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/emoticons/"); pref("extensions.getMoreProtocolsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/protocols/"); @@ -166,7 +165,7 @@ index b7a397017..7b91410f9 100644 // don't load links inside Instantbird pref("network.protocol-handler.expose-all", false); -@@ -259,13 +321,13 @@ pref("network.protocol-handler.expose.https", true); +@@ -259,13 +320,13 @@ pref("network.protocol-handler.expose.https", true); // expose javascript: so that message themes can use it. // javascript: links inside messages are filtered out. @@ -183,7 +182,7 @@ index b7a397017..7b91410f9 100644 // We have an Error Console menu item by default so let's display chrome errors pref("javascript.options.showInConsole", true); -@@ -300,14 +362,333 @@ pref("browser.tabs.tabClipWidth", 140); +@@ -300,14 +361,333 @@ pref("browser.tabs.tabClipWidth", 140); // 3 at the end of the tabstrip pref("browser.tabs.closeButtons", 1); @@ -353,7 +352,7 @@ index b7a397017..7b91410f9 100644 +// bug 18950 for more details. +pref("browser.reader.detectedFirstArticle", true); +pref("reader.parse-on-load.enabled", false); -+pref("privacy.use_utc_timezone", true); ++pref("privacy.use_utc_timezone", false); // TM + +// Third party stuff +//pref("network.cookie.cookieBehavior", 1); // TM diff --git a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch index c090c07..a428a00 100644 --- a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch +++ b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch @@ -1,7 +1,7 @@ -From 5dc74f402183115a4d60d69c96bcd770f794c014 Mon Sep 17 00:00:00 2001 +From 4b44c103a9b4c7a35ce9157bb671a2937a0111e1 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Mon, 16 Nov 2015 20:37:53 -0800 -Subject: [PATCH 02/27] Trac 21634: Autologin default should be false +Subject: [PATCH 02/28] Trac 21634: Autologin default should be false --- chat/components/src/imAccounts.js | 2 +- diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch index f1f9468..af29c25 100644 --- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch +++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch @@ -1,7 +1,7 @@ -From bee69d70cfbb69967da3a6457d232177d70af26b Mon Sep 17 00:00:00 2001 +From 5eec6f52c78cb09a1e4c4501a95e34ffe21d0d14 Mon Sep 17 00:00:00 2001 From: aleth <aleth@instantbird.org> Date: Sat, 30 Jan 2016 20:56:38 +0100 -Subject: [PATCH 03/27] Trac 17896: Support "Special Characters" input prompt +Subject: [PATCH 03/28] Trac 17896: Support "Special Characters" input prompt on OS X * Bug 1151784 - Add Edit menu to the conversation window on OS X. r=nhnt11,florian diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch index 487755b..0a42f29 100644 --- a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch +++ b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch @@ -1,7 +1,7 @@ -From 31c4a6075ae676f0e2600efe20aad0ca79228d29 Mon Sep 17 00:00:00 2001 +From 81f299a5113a5fd7261bdfffca05be8ecec71bbd Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Tue, 2 Feb 2016 16:04:51 -0800 -Subject: [PATCH 04/27] Trac 17494: Better error reporting for failed outgoing +Subject: [PATCH 04/28] Trac 17494: Better error reporting for failed outgoing messages * Bug 1245325 - Better error reporting for failed outgoing messages. r=clokep diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch index 4c877dd..18d684e 100644 --- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch +++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch @@ -1,7 +1,7 @@ -From c683744608becc6e1cb8086f64f878db4b03b293 Mon Sep 17 00:00:00 2001 +From 610d64905425755c3602d33ba36af5435dbc2631 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Tue, 15 Mar 2016 17:40:42 -0700 -Subject: [PATCH 05/27] Trac 13312: OTR over Twitter DMs +Subject: [PATCH 05/28] Trac 13312: OTR over Twitter DMs --- chat/components/src/imConversations.js | 3 +- diff --git a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch index 94c296b..c6e5d1c 100644 --- a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch +++ b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch @@ -1,7 +1,7 @@ -From d704d7f249b75e419b967087364ff360fd634762 Mon Sep 17 00:00:00 2001 +From eccb5b4b6c09fa2fd8f6da0bfa915afe79ebddcf Mon Sep 17 00:00:00 2001 From: Nihanth Subramanya <nhnt11@gmail.com> Date: Sun, 9 Oct 2016 21:53:04 -0700 -Subject: [PATCH 06/27] Bug 1218193 - Fix tab strip background colour on OS X. +Subject: [PATCH 06/28] Bug 1218193 - Fix tab strip background colour on OS X. r=aleth --- diff --git a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch index 7a141df..23a8716 100644 --- a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch +++ b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch @@ -1,7 +1,7 @@ -From 53631ac27f28be5098056a37adb490471dc1140c Mon Sep 17 00:00:00 2001 +From 22d64ca4c9ec08609cdcf78ed6b969522217c256 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Sun, 9 Oct 2016 21:57:07 -0700 -Subject: [PATCH 07/27] Bug 1246431 - XMPP createConversation should handle +Subject: [PATCH 07/28] Bug 1246431 - XMPP createConversation should handle incoming messages from the server properly. r=aleth --- diff --git a/projects/instantbird/0008-XMPP-in-band-registration.patch b/projects/instantbird/0008-XMPP-in-band-registration.patch index 3927919..096e648 100644 --- a/projects/instantbird/0008-XMPP-in-band-registration.patch +++ b/projects/instantbird/0008-XMPP-in-band-registration.patch @@ -1,7 +1,7 @@ -From 75174e806cd046a2c975ecbae8ad6f7fdae8fba9 Mon Sep 17 00:00:00 2001 +From a1de4a4aaedf227494a80f91bfa8edbf15547e49 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir@torproject.org> Date: Mon, 10 Oct 2016 18:42:25 -0700 -Subject: [PATCH 08/27] XMPP in-band registration +Subject: [PATCH 08/28] XMPP in-band registration --- chat/locales/en-US/xmpp.properties | 5 + diff --git a/projects/instantbird/0009-Remove-search-from-UI.patch b/projects/instantbird/0009-Remove-search-from-UI.patch index 2e20a8e..7e716d1 100644 --- a/projects/instantbird/0009-Remove-search-from-UI.patch +++ b/projects/instantbird/0009-Remove-search-from-UI.patch @@ -1,7 +1,7 @@ -From 8a3f6e91fac7248282712ed1f33bacfa93b9c7b1 Mon Sep 17 00:00:00 2001 +From 1416efe7c0d089fa0782f8234c66096f5d5e9520 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir@torproject.org> Date: Mon, 10 Oct 2016 18:47:48 -0700 -Subject: [PATCH 09/27] Remove search from UI +Subject: [PATCH 09/28] Remove search from UI --- im/content/nsContextMenu.js | 18 +----------------- diff --git a/projects/instantbird/0010-Add-Tor-Messenger-branding.patch b/projects/instantbird/0010-Add-Tor-Messenger-branding.patch index 399d409..d1f733f 100644 --- a/projects/instantbird/0010-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0010-Add-Tor-Messenger-branding.patch @@ -1,7 +1,7 @@ -From 420c326c8c91fd204cbd530c522a94b8849cdc30 Mon Sep 17 00:00:00 2001 +From 1368d7678fbfb6dc5fbd09a70dbf328f847d5e1d Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir@torproject.org> Date: Mon, 10 Oct 2016 18:56:27 -0700 -Subject: [PATCH 10/27] Add Tor Messenger branding +Subject: [PATCH 10/28] Add Tor Messenger branding --- im/app/macbuild/Contents/Info.plist.in | 2 +- diff --git a/projects/instantbird/0011-Account-picture.patch b/projects/instantbird/0011-Account-picture.patch index 5853b64..88907e6 100644 --- a/projects/instantbird/0011-Account-picture.patch +++ b/projects/instantbird/0011-Account-picture.patch @@ -1,7 +1,7 @@ -From 479dd68a7f055242dd6aa3a16d800b4700bd8bc3 Mon Sep 17 00:00:00 2001 +From 70b53480506595d02d5b0ede56501ef9ec48919f Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir@torproject.org> Date: Mon, 10 Oct 2016 19:24:09 -0700 -Subject: [PATCH 11/27] Account picture +Subject: [PATCH 11/28] Account picture --- im/content/blist.xul | 3 +-- diff --git a/projects/instantbird/0012-Modify-protocol-defaults.patch b/projects/instantbird/0012-Modify-protocol-defaults.patch index 7cc9fda..79ca55e 100644 --- a/projects/instantbird/0012-Modify-protocol-defaults.patch +++ b/projects/instantbird/0012-Modify-protocol-defaults.patch @@ -1,7 +1,7 @@ -From a79fddb0057e69473da02837b057f4ae57aba915 Mon Sep 17 00:00:00 2001 +From 2d8c5549ba5c0aa71a166bc504c431edab8f755f Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir@torproject.org> Date: Mon, 10 Oct 2016 19:25:34 -0700 -Subject: [PATCH 12/27] Modify protocol defaults +Subject: [PATCH 12/28] Modify protocol defaults * Top protocols diff --git a/projects/instantbird/0013-Modify-IRC-defaults.patch b/projects/instantbird/0013-Modify-IRC-defaults.patch index dd4c4f4..1ae35e4 100644 --- a/projects/instantbird/0013-Modify-IRC-defaults.patch +++ b/projects/instantbird/0013-Modify-IRC-defaults.patch @@ -1,7 +1,7 @@ -From 0c3d7d55604044a29f03084b70b20945ae116c0f Mon Sep 17 00:00:00 2001 +From 37f684af18a7d1926960090bb3148d520312abbd Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir@torproject.org> Date: Mon, 10 Oct 2016 19:31:58 -0700 -Subject: [PATCH 13/27] Modify IRC defaults +Subject: [PATCH 13/28] Modify IRC defaults * ctcp ping diff --git a/projects/instantbird/0014-Modify-themes.patch b/projects/instantbird/0014-Modify-themes.patch index 3aa77b8..1cc0b5e 100644 --- a/projects/instantbird/0014-Modify-themes.patch +++ b/projects/instantbird/0014-Modify-themes.patch @@ -1,7 +1,7 @@ -From 9901bceb26952e7680ae3c43561e69e08bbe0791 Mon Sep 17 00:00:00 2001 +From 4fb4d944d10666356408cbb222b38344496dc71a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir@torproject.org> Date: Mon, 10 Oct 2016 19:36:38 -0700 -Subject: [PATCH 14/27] Modify themes +Subject: [PATCH 14/28] Modify themes * theme extension updateh diff --git a/projects/instantbird/0015-Modify-XMPP-defaults.patch b/projects/instantbird/0015-Modify-XMPP-defaults.patch index d08cf65..d7c7579 100644 --- a/projects/instantbird/0015-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0015-Modify-XMPP-defaults.patch @@ -1,7 +1,7 @@ -From 95f97927c7c987e597aaaf7896b372672a7d635d Mon Sep 17 00:00:00 2001 +From 7c0ab255fb151bf52479c6b4a6f9fe8d423155ac Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir@torproject.org> Date: Mon, 10 Oct 2016 19:38:49 -0700 -Subject: [PATCH 15/27] Modify XMPP defaults +Subject: [PATCH 15/28] Modify XMPP defaults * xmpp-default-domain diff --git a/projects/instantbird/0016-Remove-logging-UI.patch b/projects/instantbird/0016-Remove-logging-UI.patch index 7188405..19d1145 100644 --- a/projects/instantbird/0016-Remove-logging-UI.patch +++ b/projects/instantbird/0016-Remove-logging-UI.patch @@ -1,7 +1,7 @@ -From cecec905070c50b4a1a659154e5e241e47081734 Mon Sep 17 00:00:00 2001 +From 2429558476e6e13af0a38789111e5b9c0494d73a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir@torproject.org> Date: Mon, 10 Oct 2016 19:50:48 -0700 -Subject: [PATCH 16/27] Remove logging UI +Subject: [PATCH 16/28] Remove logging UI --- im/content/preferences/privacy.xul | 20 -------------------- diff --git a/projects/instantbird/0017-Cert-override.patch b/projects/instantbird/0017-Cert-override.patch index ec14ea7..7a7f6ef 100644 --- a/projects/instantbird/0017-Cert-override.patch +++ b/projects/instantbird/0017-Cert-override.patch @@ -1,7 +1,7 @@ -From d58eea036a12d99f43f0c1f27482a6da93853d72 Mon Sep 17 00:00:00 2001 +From 655a4f263afff106dc087fac917ae56c5720035b Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir@torproject.org> Date: Mon, 10 Oct 2016 19:56:46 -0700 -Subject: [PATCH 17/27] Cert override +Subject: [PATCH 17/28] Cert override --- im/app/profile/cert_override.txt | 3 +++ diff --git a/projects/instantbird/0018-Display-all-traffic-over-Tor.patch b/projects/instantbird/0018-Display-all-traffic-over-Tor.patch index 2ea21b5..c319138 100644 --- a/projects/instantbird/0018-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0018-Display-all-traffic-over-Tor.patch @@ -1,7 +1,7 @@ -From bbb7c86f99460d9205cd215959f0dee1d1b439a7 Mon Sep 17 00:00:00 2001 +From d5874c98daf8d4e7304876cd6fa6083c54c0c644 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir@torproject.org> Date: Mon, 10 Oct 2016 19:58:31 -0700 -Subject: [PATCH 18/27] Display all traffic over Tor +Subject: [PATCH 18/28] Display all traffic over Tor --- im/content/accountWizard.xul | 2 ++ diff --git a/projects/instantbird/0019-Trac-17480-Content-sink.patch b/projects/instantbird/0019-Trac-17480-Content-sink.patch index 020ae83..e9ab1ee 100644 --- a/projects/instantbird/0019-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0019-Trac-17480-Content-sink.patch @@ -1,7 +1,7 @@ -From ee33181a286627076114668d5173a170d0e46066 Mon Sep 17 00:00:00 2001 +From 30751b0288d46103956b395e68b906e5e4e40bfe Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Wed, 5 Oct 2016 11:09:25 -0700 -Subject: [PATCH 19/27] Trac 17480: Content sink +Subject: [PATCH 19/28] Trac 17480: Content sink --- chat/modules/imContentSink.jsm | 33 ++++++--------------------------- diff --git a/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch index 9f35cf8..86a4dbb 100644 --- a/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,7 +1,7 @@ -From 95c1c1ae542c19accfcfb8e00a4053d427e7116a Mon Sep 17 00:00:00 2001 +From 0a32b351472debfa5a80309eec7037889725164a Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Sun, 2 Oct 2016 08:46:55 -0700 -Subject: [PATCH 20/27] SASL ECDSA-NIST256P-CHALLENGE +Subject: [PATCH 20/28] SASL ECDSA-NIST256P-CHALLENGE --- chat/components/src/imAccounts.js | 1 + diff --git a/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch index 46b45e5..e61301e 100644 --- a/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch +++ b/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch @@ -1,7 +1,7 @@ -From a4506bc5184ef5b27fc0fe6cf563cf4ae4e60d76 Mon Sep 17 00:00:00 2001 +From 57df7563fb512450b491f743a7cf070caaf63e6f Mon Sep 17 00:00:00 2001 From: aleth <aleth@instantbird.org> Date: Wed, 26 Oct 2016 20:16:58 +0200 -Subject: [PATCH 21/27] Bug 1313137 - "msg is not defined" error in +Subject: [PATCH 21/28] Bug 1313137 - "msg is not defined" error in irc.js:changeBuddyNick. r=clokep --HG-- diff --git a/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch b/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch index e4580b1..b3548b6 100644 --- a/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch +++ b/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch @@ -1,7 +1,7 @@ -From fb88d4775ad60abac118db70b550329e5a50aaf6 Mon Sep 17 00:00:00 2001 +From 366aa6588bf29cb0ecd1b63177a95d51fd803962 Mon Sep 17 00:00:00 2001 From: aleth <aleth@instantbird.org> Date: Thu, 12 May 2016 15:10:43 +0200 -Subject: [PATCH 22/27] Bug 954368 - Contact list entries should adapt their +Subject: [PATCH 22/28] Bug 954368 - Contact list entries should adapt their height to the actual font size. r=florian --HG-- diff --git a/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch b/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch index dfe5c7b..e8f2b59 100644 --- a/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch +++ b/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch @@ -1,7 +1,7 @@ -From c841f414adabbe759f9aa2b3c99c306480958cc2 Mon Sep 17 00:00:00 2001 +From a7a2bff864f3e6a79062dd2da95c0464c818d45e Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Sat, 5 Nov 2016 14:55:20 -0700 -Subject: [PATCH 23/27] Bug 1187281 - Only show "close" button on Windows +Subject: [PATCH 23/28] Bug 1187281 - Only show "close" button on Windows --- im/content/accounts.xul | 2 ++ diff --git a/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch b/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch index 4ae030a..c5f3582 100644 --- a/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch +++ b/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch @@ -1,7 +1,7 @@ -From 88cf8f20c8e2fc88c1ccad38ce0d829f2b32bf96 Mon Sep 17 00:00:00 2001 +From ec5d00df9f1e5d5f00e239e57bbf730fb280aa65 Mon Sep 17 00:00:00 2001 From: Patrick Cloke <clokep@gmail.com> Date: Wed, 9 Nov 2016 09:03:49 -0800 -Subject: [PATCH 24/27] Bug 1316000 - Remove old Yahoo! Messenger support. +Subject: [PATCH 24/28] Bug 1316000 - Remove old Yahoo! Messenger support. r=aleth --- diff --git a/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch index 730442f..5a44508 100644 --- a/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch +++ b/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -1,7 +1,7 @@ -From 64be3bc7ee42bf7579da76f42b5f4d3c069e77bf Mon Sep 17 00:00:00 2001 +From 8479e9cddfebf6cde81f3ca0be615da48bb923a8 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Thu, 1 Dec 2016 13:25:42 -0800 -Subject: [PATCH 25/27] Bug 1321641 - Use built-in functions instead of an svg +Subject: [PATCH 25/28] Bug 1321641 - Use built-in functions instead of an svg for bubbles filter --- diff --git a/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch b/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch index 00db633..cc974ba 100644 --- a/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch +++ b/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch @@ -1,7 +1,7 @@ -From 1535a81698fffa329e15c285c4feb433c134434b Mon Sep 17 00:00:00 2001 +From c3d0c1e82812698d6da4a5890860fd1b43e7fcbd Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Thu, 1 Dec 2016 14:34:51 -0800 -Subject: [PATCH 26/27] Bug 1321420 - Add a pref to disable JavaScript in +Subject: [PATCH 26/28] Bug 1321420 - Add a pref to disable JavaScript in browser requests --- diff --git a/projects/instantbird/0027-Trac-17517-Use-different-color-for-Add-Exception.patch b/projects/instantbird/0027-Trac-17517-Use-different-color-for-Add-Exception.patch index 84f166a..c063927 100644 --- a/projects/instantbird/0027-Trac-17517-Use-different-color-for-Add-Exception.patch +++ b/projects/instantbird/0027-Trac-17517-Use-different-color-for-Add-Exception.patch @@ -1,7 +1,7 @@ -From 87fd1c478b2bd75333c68a3082d02fd2ac8ef03f Mon Sep 17 00:00:00 2001 +From d8da579110668bc37caf42e9e8e88e66fb3aa566 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633@gmail.com> Date: Tue, 27 Dec 2016 08:31:36 +0700 -Subject: [PATCH 27/27] Trac 17517 - Use different color for Add Exception +Subject: [PATCH 27/28] Trac 17517 - Use different color for Add Exception --- im/content/accounts.css | 4 ++++ diff --git a/projects/instantbird/0028-Trac-21736-Hide-account-timestamp-from-message.patch b/projects/instantbird/0028-Trac-21736-Hide-account-timestamp-from-message.patch new file mode 100644 index 0000000..1546102 --- /dev/null +++ b/projects/instantbird/0028-Trac-21736-Hide-account-timestamp-from-message.patch @@ -0,0 +1,64 @@ +From ef9ba3773fa442dd6b0d1b60056a2f07940cdc6c Mon Sep 17 00:00:00 2001 +From: Vu Quoc Huy <huyvq.c633@gmail.com> +Date: Sun, 2 Apr 2017 13:07:09 -0400 +Subject: [PATCH 28/28] Trac 21736 - Hide account/timestamp from message + +--- + chat/modules/imThemes.jsm | 9 ++++----- + im/app/profile/all-instantbird.js | 5 +++++ + 2 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/chat/modules/imThemes.jsm b/chat/modules/imThemes.jsm +index be6026c07..ad822cd86 100644 +--- a/chat/modules/imThemes.jsm ++++ b/chat/modules/imThemes.jsm +@@ -892,8 +892,7 @@ SelectedMessage.prototype = { + try { + let prefBranch = + Services.prefs.getBranch("messenger.conversations.selections."); +- return prefBranch.getComplexValue(aName, +- Ci.nsIPrefLocalizedString).data; ++ return prefBranch.getCharPref(aName); + } catch(e) { + return aDefault; + } +@@ -902,17 +901,17 @@ SelectedMessage.prototype = { + if (msg.system) { + replacements = statusReplacements; + html = getLocalizedPrefWithDefault("systemMessagesTemplate", +- "%time% - %message%"); ++ ""); + } + else { + replacements = messageReplacements; + if (/^(<[^>]+>)*\/me /.test(msg.displayMessage)) { + html = getLocalizedPrefWithDefault("actionMessagesTemplate", +- "%time% * %sender% %message%"); ++ ""); + } + else { + html = getLocalizedPrefWithDefault("contentMessagesTemplate", +- "%time% - %sender%: %message%"); ++ ""); + } + } + +diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js +index 89593abeb..3b31c61ee 100644 +--- a/im/app/profile/all-instantbird.js ++++ b/im/app/profile/all-instantbird.js +@@ -47,6 +47,11 @@ pref("extensions.systemAddon.update.url", ""); + // background (in seconds) + pref("app.update.download.backgroundInterval", 60); + ++// Hide the timestamp and account from message selection templates ++pref("messenger.conversations.selections.actionMessagesTemplate", "%message%"); ++pref("messenger.conversations.selections.contentMessagesTemplate", "%message%"); ++pref("messenger.conversations.selections.systemMessagesTemplate", "%message%"); ++ + + /* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this +-- +2.12.2 + diff --git a/projects/instantbird/config b/projects/instantbird/config index e9f03d2..a49bb7e 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -89,6 +89,7 @@ input_files: - filename: 0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch - filename: 0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch - filename: 0027-Trac-17517-Use-different-color-for-Add-Exception.patch + - filename: 0028-Trac-21736-Hide-account-timestamp-from-message.patch - filename: mozconfig-common - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig