commit 2678bea56045250a47387a41def178b9fc35db8d Author: Vu Quoc Huy <huyvq.c633@gmail.com> Date: Fri Mar 31 15:39:59 2017 -0400 Add some missing localization for Twitter's actions (like, unlike) --- ChangeLog | 1 + .../0001-Set-Tor-Messenger-preferences.patch | 2 +- ...c-21634-Autologin-default-should-be-false.patch | 2 +- ...Support-Special-Characters-input-prompt-o.patch | 2 +- ...Better-error-reporting-for-failed-outgoin.patch | 2 +- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 29 +++++++++++++++++++--- ...-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 +-- 28 files changed, 75 insertions(+), 51 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f644e8..56768c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ Tor Messenger 0.4.0b3 -- * All Platforms + * Add some missing localization for Twitter's actions 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 74746cc..fc8da85 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -521,5 +521,5 @@ index b7a397017..7b91410f9 100644 +#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); +#endif -- -2.12.0 +2.12.2 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 e57d822..c090c07 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 @@ -35,5 +35,5 @@ index 5fa5b8293..f0933af7f 100644 </wizard> -- -2.12.0 +2.12.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 03ea2b6..f1f9468 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 @@ -74,5 +74,5 @@ index 30aeb1fc5..14fc9e8f6 100644 <keyset id="mainkeyset"/> <menubar id="blistMenubar"/> -- -2.12.0 +2.12.2 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 7360fa9..487755b 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 @@ -63,5 +63,5 @@ index 7c3fcd7e6..282575938 100644 else if (this._isMucParticipant && muc && !muc.left && error.condition == "item-not-found") { -- -2.12.0 +2.12.2 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 bd453e5..4c877dd 100644 --- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch +++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch @@ -1,13 +1,14 @@ -From 8021b15b4da53e14b9b595d370dd0a2b24306d31 Mon Sep 17 00:00:00 2001 +From c683744608becc6e1cb8086f64f878db4b03b293 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 --- chat/components/src/imConversations.js | 3 +- + chat/locales/en-US/twitter.properties | 4 + chat/modules/imContentSink.jsm | 10 +- chat/protocols/twitter/twitter.js | 484 +++++++++++++++++++-------------- - 3 files changed, 289 insertions(+), 208 deletions(-) + 4 files changed, 293 insertions(+), 208 deletions(-) diff --git a/chat/components/src/imConversations.js b/chat/components/src/imConversations.js index 6fc5d0d24..2a53a2c86 100644 @@ -23,6 +24,28 @@ index 6fc5d0d24..2a53a2c86 100644 this._messages.push(aSubject); ++this._unreadMessageCount; +diff --git a/chat/locales/en-US/twitter.properties b/chat/locales/en-US/twitter.properties +index 759eaa79c..8f0701aa7 100644 +--- a/chat/locales/en-US/twitter.properties ++++ b/chat/locales/en-US/twitter.properties +@@ -17,6 +17,8 @@ error.tooLong=Status is over 140 characters. + error.general=An error %1$S occurred while sending: %2$S + error.retweet=An error %1$S occurred while retweeting: %2$S + error.delete=An error %1$S occurred while deleting: %2$S ++error.like=An error %1$S occured while liking: %2$S ++error.unlike=An error %1$S occured while unliking: %2$S + # LOCALIZATION NOTE (error.descriptionTooLong) + # %S is the truncated string that was sent to the server. + error.descriptionTooLong=Description is over the maximum length (160 characters), it was automatically truncated to: %S. +@@ -36,6 +38,8 @@ action.delete=Delete + # %S will be replaced by the screen name of a twitter user. + action.follow=Follow %S + action.stopFollowing=Stop following %S ++action.like=Like ++action.unlike=Remove Like + + # LOCALIZATION NOTE (event.follow, event.unfollow, event.followed): + # This will be displayed in system messages inside the timeline conversation. diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm index ee067afdf..abd95fc71 100644 --- a/chat/modules/imContentSink.jsm @@ -739,5 +762,5 @@ index 59f60cc22..4d8e04c02 100644 }; -- -2.12.0 +2.12.2 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 11b1c1d..94c296b 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,4 +1,4 @@ -From dcc285760341f0e9584866addbb0152c97e5321e Mon Sep 17 00:00:00 2001 +From d704d7f249b75e419b967087364ff360fd634762 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. @@ -22,5 +22,5 @@ index 76c5094e3..291545039 100644 background-repeat: repeat-x; } -- -2.12.0 +2.12.2 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 804e7ec..7a141df 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,4 +1,4 @@ -From 5955ea03c2000d832b2939fdcf148b08f702380c Mon Sep 17 00:00:00 2001 +From 53631ac27f28be5098056a37adb490471dc1140c 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 @@ -22,5 +22,5 @@ index 282575938..71f777009 100644 throw "Invalid JID"; } -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0008-XMPP-in-band-registration.patch b/projects/instantbird/0008-XMPP-in-band-registration.patch index c673902..3927919 100644 --- a/projects/instantbird/0008-XMPP-in-band-registration.patch +++ b/projects/instantbird/0008-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From 3c4237848553f5915a821cab2dc86ac75d7bf826 Mon Sep 17 00:00:00 2001 +From 75174e806cd046a2c975ecbae8ad6f7fdae8fba9 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 @@ -392,5 +392,5 @@ index 43d0f19e3..c46fb2f95 100644 + +<!ENTITY registerXMPP.label "Create this new account on the server"> -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0009-Remove-search-from-UI.patch b/projects/instantbird/0009-Remove-search-from-UI.patch index 27b1527..2e20a8e 100644 --- a/projects/instantbird/0009-Remove-search-from-UI.patch +++ b/projects/instantbird/0009-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From e217dc3951c7a1a2559bf04866e0e5c186631d03 Mon Sep 17 00:00:00 2001 +From 8a3f6e91fac7248282712ed1f33bacfa93b9c7b1 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 @@ -60,5 +60,5 @@ index fad67c190..cfe2405ea 100644 <groupbox> <caption label="&configEditDesc.label;"/> -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0010-Add-Tor-Messenger-branding.patch b/projects/instantbird/0010-Add-Tor-Messenger-branding.patch index 110504b..399d409 100644 --- a/projects/instantbird/0010-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0010-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 958bf64a3a272cf190a08fe1e2a3ead98b05c0c3 Mon Sep 17 00:00:00 2001 +From 420c326c8c91fd204cbd530c522a94b8849cdc30 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 @@ -5130,5 +5130,5 @@ index 15ec569c1..4a2d35d8a 100644 -Info=Instantbird is installing your updates and will start in a few moments… +Info=Tor Messenger is installing your updates and will start in a few moments… -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0011-Account-picture.patch b/projects/instantbird/0011-Account-picture.patch index e63dfed..5853b64 100644 --- a/projects/instantbird/0011-Account-picture.patch +++ b/projects/instantbird/0011-Account-picture.patch @@ -1,4 +1,4 @@ -From c11815bef7688c982eba290aeb4243cd90157bf1 Mon Sep 17 00:00:00 2001 +From 479dd68a7f055242dd6aa3a16d800b4700bd8bc3 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 @@ -22,5 +22,5 @@ index b90fddadb..f29a48b99 100644 <panel id="changeUserIconPanel" type="arrow" align="center" -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0012-Modify-protocol-defaults.patch b/projects/instantbird/0012-Modify-protocol-defaults.patch index f678291..7cc9fda 100644 --- a/projects/instantbird/0012-Modify-protocol-defaults.patch +++ b/projects/instantbird/0012-Modify-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 945f99a48e5b6c2cd3ae47c166ee81fcb80ad9b6 Mon Sep 17 00:00:00 2001 +From a79fddb0057e69473da02837b057f4ae57aba915 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 @@ -44,5 +44,5 @@ index d552a232b..7d371bd21 100644 topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline topProtocol.prpl-aim.description=Chat with your buddies on AOL Instant Messenger -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0013-Modify-IRC-defaults.patch b/projects/instantbird/0013-Modify-IRC-defaults.patch index 64687f5..dd4c4f4 100644 --- a/projects/instantbird/0013-Modify-IRC-defaults.patch +++ b/projects/instantbird/0013-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 50e63aa0881f5c7b53d4df031c1634d78d5a52b8 Mon Sep 17 00:00:00 2001 +From 0c3d7d55604044a29f03084b70b20945ae116c0f 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 @@ -61,5 +61,5 @@ index 28eb374f4..120be10ee 100644 ". Sending TIME response: \"" + now + "\"."); this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now); -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0014-Modify-themes.patch b/projects/instantbird/0014-Modify-themes.patch index d2d071a..3aa77b8 100644 --- a/projects/instantbird/0014-Modify-themes.patch +++ b/projects/instantbird/0014-Modify-themes.patch @@ -1,4 +1,4 @@ -From 5dbad67d76f4aa17773d84ebb4d9b275ecde5696 Mon Sep 17 00:00:00 2001 +From 9901bceb26952e7680ae3c43561e69e08bbe0791 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 @@ -74,5 +74,5 @@ index 454e36696..18ba1f95c 100644 <separator class="thin"/> <description>&emoticonsPreview.description;</description> -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0015-Modify-XMPP-defaults.patch b/projects/instantbird/0015-Modify-XMPP-defaults.patch index 7818d09..d08cf65 100644 --- a/projects/instantbird/0015-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0015-Modify-XMPP-defaults.patch @@ -1,4 +1,4 @@ -From 615a33df16f01fb31edda347f0da1189c6ab2275 Mon Sep 17 00:00:00 2001 +From 95f97927c7c987e597aaaf7896b372672a7d635d 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 @@ -44,5 +44,5 @@ index 265445a18..a5635cae3 100644 connection_security: { get label() { return _("options.connectionSecurity"); }, -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0016-Remove-logging-UI.patch b/projects/instantbird/0016-Remove-logging-UI.patch index 5df159f..7188405 100644 --- a/projects/instantbird/0016-Remove-logging-UI.patch +++ b/projects/instantbird/0016-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From addbd96ff280d076cc33cd2684351e3953261ac8 Mon Sep 17 00:00:00 2001 +From cecec905070c50b4a1a659154e5e241e47081734 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 @@ -39,5 +39,5 @@ index 7c9db1cdd..2d7b2701e 100644 <groupbox id="passwordsGroup" orient="vertical"> <caption label="&passwords.label;"/> -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0017-Cert-override.patch b/projects/instantbird/0017-Cert-override.patch index 65fe8a8..ec14ea7 100644 --- a/projects/instantbird/0017-Cert-override.patch +++ b/projects/instantbird/0017-Cert-override.patch @@ -1,4 +1,4 @@ -From 0663d5a36f26573f57492f59212dd3838eeb202d Mon Sep 17 00:00:00 2001 +From d58eea036a12d99f43f0c1f27482a6da93853d72 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 @@ -60,5 +60,5 @@ index 1174b3dfd..3e35a2e1b 100644 #ifdef XP_MACOSX @RESPATH@/components/ibDockBadge.js -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0018-Display-all-traffic-over-Tor.patch b/projects/instantbird/0018-Display-all-traffic-over-Tor.patch index a8584d9..2ea21b5 100644 --- a/projects/instantbird/0018-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0018-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From 6783f32dd427882b0d4208ddbfe7726d1df691ca Mon Sep 17 00:00:00 2001 +From bbb7c86f99460d9205cd215959f0dee1d1b439a7 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 @@ -34,5 +34,5 @@ index c46fb2f95..6b49c84fa 100644 <!ENTITY accountProtocolShowMore.label "Show all protocols"> <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols"> -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0019-Trac-17480-Content-sink.patch b/projects/instantbird/0019-Trac-17480-Content-sink.patch index 31e0233..020ae83 100644 --- a/projects/instantbird/0019-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0019-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From 12cc9af695761d8ec46c74f75f7ed556f7511b58 Mon Sep 17 00:00:00 2001 +From ee33181a286627076114668d5173a170d0e46066 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 @@ -107,5 +107,5 @@ index 3b8ccfa2b..ba41da76a 100644 <menuitem value="0" label="&filterLevelNone;"/> </menupopup> -- -2.12.0 +2.12.2 diff --git a/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch index c5b0f02..9f35cf8 100644 --- a/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From df852a62c5a50a1277f8ccfa7791081ccb89b8a3 Mon Sep 17 00:00:00 2001 +From 95c1c1ae542c19accfcfb8e00a4053d427e7116a 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 @@ -8915,5 +8915,5 @@ index bc2539687..e46815dfe 100644 'ircCAP.jsm', 'ircCommands.jsm', -- -2.12.0 +2.12.2 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 845ad79..46b45e5 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,4 +1,4 @@ -From 83615f349e491a0aad08fb944c7167bbdd300bfc Mon Sep 17 00:00:00 2001 +From a4506bc5184ef5b27fc0fe6cf563cf4ae4e60d76 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 @@ -25,5 +25,5 @@ index c2167a5ec..b58c2c2eb 100644 }, -- -2.12.0 +2.12.2 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 1bdb683..e4580b1 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,4 +1,4 @@ -From 76c8fe4359c6195611de41816a9f5c10ecbbcef9 Mon Sep 17 00:00:00 2001 +From fb88d4775ad60abac118db70b550329e5a50aaf6 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 @@ -318,5 +318,5 @@ index 992267405..c033b51bc 100644 min-width: 16px; } -- -2.12.0 +2.12.2 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 ed8dab9..dfe5c7b 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,4 +1,4 @@ -From 3202882e5ae047c5492f45d3d2ec40e965e21bf2 Mon Sep 17 00:00:00 2001 +From c841f414adabbe759f9aa2b3c99c306480958cc2 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 @@ -21,5 +21,5 @@ index f3f1c6bbb..d683562cb 100644 </windowdragbox> </window> -- -2.12.0 +2.12.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 7c39d58..4ae030a 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,4 +1,4 @@ -From a1ddac93a12d3ec0943828944389a09e112929eb Mon Sep 17 00:00:00 2001 +From 88cf8f20c8e2fc88c1ccad38ce0d829f2b32bf96 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. @@ -2394,5 +2394,5 @@ index 16c665ab4..a4b9fc638 100644 if ("color" in style) styleAttributes += " color=\"" + style.color + "\""; -- -2.12.0 +2.12.2 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 faa2677..730442f 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,4 +1,4 @@ -From 88d7f895904bac92b6e110816baeb41e4cf93a56 Mon Sep 17 00:00:00 2001 +From 64be3bc7ee42bf7579da76f42b5f4d3c069e77bf 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 @@ -53,5 +53,5 @@ index 15ba97346..4488c30bb 100644 .indicator { -- -2.12.0 +2.12.2 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 3c2382d..00db633 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,4 +1,4 @@ -From 0aedf14b3813f345814eba086b7b4732081d45c5 Mon Sep 17 00:00:00 2001 +From 1535a81698fffa329e15c285c4feb433c134434b 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 @@ -48,5 +48,5 @@ index c52c8c637..0069219fa 100644 Components.interfaces.nsIWebProgress.NOTIFY_ALL); let url = request.url; -- -2.12.0 +2.12.2 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 306c45d..84f166a 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,4 +1,4 @@ -From 366268d208bacf04880fce5c01d4edaa611c1694 Mon Sep 17 00:00:00 2001 +From 87fd1c478b2bd75333c68a3082d02fd2ac8ef03f 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 @@ -21,5 +21,5 @@ index 7820b5aaf..bc555acce 100644 +} \ No newline at end of file -- -2.12.0 +2.12.2