Commit bbded9ce authored by Sukhbir Singh's avatar Sukhbir Singh
Browse files

Bug 13855: Use known onions for XMPP servers

parent 73e2a43a

projects/instantbird/0001-Set-Tor-Messenger-preferences.patch

+3 −3
Original line number Diff line number Diff line 
From 54583578a3e2753cd5fee169596325fa761d5554 Mon Sep 17 00:00:00 2001

From 84b615b2662ff85ad071d988455e17dbca96e0aa Mon Sep 17 00:00:00 2001

From: Sukhbir Singh <sukhbir@torproject.org>

Date: Wed, 26 Jul 2017 14:30:41 -0400

Subject: [PATCH 01/20] Set Tor Messenger preferences

Subject: [PATCH 01/21] Set Tor Messenger preferences



---

 im/app/profile/all-instantbird.js | 451 ++++++++++++++++++++++++++++++++++++--
@@ -551,5 +551,5 @@ index 127c86a662..454ca7ea1b 100644 
+#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__);

+#endif

-- 

2.13.3

2.14.1

projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch

+3 −3
Original line number Diff line number Diff line 
From d6d5054c6dd1aaa01d14729ebcbd423dec2146b7 Mon Sep 17 00:00:00 2001

From 7e93084b924a4a3ffdaf6576b1e948f96ae4bcc5 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/20] Trac 21634: Autologin default should be false

Subject: [PATCH 02/21] Trac 21634: Autologin default should be false



---

 chat/components/src/imAccounts.js | 2 +-
@@ -35,5 +35,5 @@ index d51df3225c..904d22ba57 100644 
 

 </wizard>

-- 

2.13.3

2.14.1

projects/instantbird/0003-XMPP-in-band-registration.patch

+3 −3
Original line number Diff line number Diff line 
From d4e57e5009a5c14ddec53518352862d0fbc5aeb9 Mon Sep 17 00:00:00 2001

From 4cc5afe3185cc2fcbc934392e088ee4ff83f39a6 Mon Sep 17 00:00:00 2001

From: Sukhbir Singh <sukhbir@torproject.org>

Date: Wed, 26 Jul 2017 15:09:40 -0400

Subject: [PATCH 03/20] XMPP in-band registration

Subject: [PATCH 03/21] XMPP in-band registration



---

 chat/locales/en-US/xmpp.properties                 |   5 +
@@ -392,5 +392,5 @@ index 43d0f19e3f..c46fb2f956 100644 
+

+<!ENTITY registerXMPP.label "Create this new account on the server">

-- 

2.13.3

2.14.1

projects/instantbird/0004-Remove-search-from-UI.patch

+3 −3
Original line number Diff line number Diff line 
From 7ecf693b9af472fce841b2bf10ea332967e5de91 Mon Sep 17 00:00:00 2001

From 33ccdd4229b2cc15c19c3e25048d8a3abdfec82d Mon Sep 17 00:00:00 2001

From: Sukhbir Singh <sukhbir@torproject.org>

Date: Mon, 10 Oct 2016 18:47:48 -0700

Subject: [PATCH 04/20] Remove search from UI

Subject: [PATCH 04/21] Remove search from UI



---

 im/content/nsContextMenu.js         | 18 +-----------------
@@ -60,5 +60,5 @@ index fad67c190b..cfe2405ea3 100644 
           <groupbox>

             <caption label="&configEditDesc.label;"/>

-- 

2.13.3

2.14.1

projects/instantbird/0005-Add-Tor-Messenger-branding.patch

+11 −12
Original line number Diff line number Diff line 
From c763e4771c903d78ed5168fe4746b9d035d56d85 Mon Sep 17 00:00:00 2001

From 58f6a00e81e0d20cfe61d7c6dd230190f3e33a89 Mon Sep 17 00:00:00 2001

From: Sukhbir Singh <sukhbir@torproject.org>

Date: Wed, 26 Jul 2017 15:46:51 -0400

Subject: [PATCH 05/20] Add Tor Messenger branding

Subject: [PATCH 05/21] Add Tor Messenger branding



---

 im/app/macbuild/Contents/Info.plist.in             |   2 +-

 im/branding/messenger/Makefile.in                  |  49 ++

 im/branding/messenger/background.png               | Bin 0 -> 1143 bytes

 im/branding/messenger/branding.nsi                 |  13 +

 im/branding/messenger/branding.nsi                 |  12 +

 im/branding/messenger/configure.sh                 |   5 +

 im/branding/messenger/content/about-credits.png    | Bin 0 -> 15182 bytes

 im/branding/messenger/content/about-footer.png     | Bin 0 -> 764 bytes
@@ -54,7 +54,7 @@ Subject: [PATCH 05/20] Add Tor Messenger branding 
 im/content/jar.mn                                  |   3 +-

 .../en-US/chrome/instantbird/aboutDialog.dtd       | 139 ++++-

 im/locales/en-US/updater/updater.ini               |   2 +-

 50 files changed, 1691 insertions(+), 160 deletions(-)

 50 files changed, 1690 insertions(+), 160 deletions(-)

 create mode 100644 im/branding/messenger/Makefile.in

 create mode 100644 im/branding/messenger/background.png

 create mode 100755 im/branding/messenger/branding.nsi
@@ -183,10 +183,10 @@ HcmV?d00001 


diff --git a/im/branding/messenger/branding.nsi b/im/branding/messenger/branding.nsi

new file mode 100755

index 0000000000..4683827fae

index 0000000000..57a3e4b314

--- /dev/null

+++ b/im/branding/messenger/branding.nsi

@@ -0,0 +1,13 @@

@@ -0,0 +1,12 @@

+# 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/.
@@ -199,7 +199,6 @@ index 0000000000..4683827fae 
+!define CompanyName           "Tor Project"

+!define URLInfoAbout          "https://www.torproject.org"

+!define URLUpdateInfo         "https://www.torproject.org"

+

diff --git a/im/branding/messenger/configure.sh b/im/branding/messenger/configure.sh

new file mode 100644

index 0000000000..7e580518b9
@@ -4658,7 +4657,7 @@ index 0000000000..e265f239c7 
+  }

+}

diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul

index c20b4f7add..4fd375d1ad 100644

index c20b4f7add..edbff07aa4 100644

--- a/im/content/aboutDialog.xul

+++ b/im/content/aboutDialog.xul

@@ -5,126 +5,165 @@
@@ -4968,7 +4967,7 @@ index 88662ff437..5d40350089 100644 
 	content/instantbird/accounts.js

 *	content/instantbird/accounts.xul

diff --git a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd b/im/locales/en-US/chrome/instantbird/aboutDialog.dtd

index ecd8d9d248..187cf5c3e1 100644

index ecd8d9d248..5d4285d5ab 100644

--- a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd

+++ b/im/locales/en-US/chrome/instantbird/aboutDialog.dtd

@@ -1,10 +1,129 @@
@@ -5122,5 +5121,5 @@ index 15ec569c11..4a2d35d8a1 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.13.3

2.14.1