March 2019 - tor-commits - lists.torproject.org

[tpo/master] Update templates
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit cb98a7f7da27d8c617f5bc2f345322c43889ae70 Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 18:55:38 2019 +0100 Update templates --- assets/static/images/tails_release.jpg | Bin 0 -> 37721 bytes assets/static/images/tor-browser_release.png | Bin 0 -> 77134 bytes assets/static/images/tor-project-logo-onions.png | Bin 0 -> 1426170 bytes assets/static/images/tor_release.png | Bin 0 -> 20762 bytes content/press/new-release-tails/contents.lr | 2 ++ content/press/new-release-tor-browser/contents.lr | 10 +++++----- content/press/new-release-tor/contents.lr | 2 ++ templates/macros/press.html | 2 +- templates/meta.html | 2 +- 9 files changed, 11 insertions(+), 7 deletions(-) diff --git a/assets/static/images/tails_release.jpg b/assets/static/images/tails_release.jpg new file mode 100644 index 0000000..b27faec Binary files /dev/null and b/assets/static/images/tails_release.jpg differ diff --git a/assets/static/images/tor-browser_release.png b/assets/static/images/tor-browser_release.png new file mode 100644 index 0000000..7feeb26 Binary files /dev/null and b/assets/static/images/tor-browser_release.png differ diff --git a/assets/static/images/tor-project-logo-onions.png b/assets/static/images/tor-project-logo-onions.png new file mode 100644 index 0000000..46bd982 Binary files /dev/null and b/assets/static/images/tor-project-logo-onions.png differ diff --git a/assets/static/images/tor_release.png b/assets/static/images/tor_release.png new file mode 100644 index 0000000..28efada Binary files /dev/null and b/assets/static/images/tor_release.png differ diff --git a/content/press/new-release-tails/contents.lr b/content/press/new-release-tails/contents.lr index 30f1468..025a222 100644 --- a/content/press/new-release-tails/contents.lr +++ b/content/press/new-release-tails/contents.lr @@ -8,6 +8,8 @@ type: release --- title: New Release: Tails 3.12 --- +image: /static/images/tails_release.jpg +--- link: https://blog.torproject.org/new-release-tails-312 --- summary: diff --git a/content/press/new-release-tor-browser/contents.lr b/content/press/new-release-tor-browser/contents.lr index ba52c2a..91ee759 100644 --- a/content/press/new-release-tor-browser/contents.lr +++ b/content/press/new-release-tor-browser/contents.lr @@ -6,15 +6,15 @@ active: True --- type: release --- -title: New Release: Tor Browser 8.5a7 +title: New Release: Tor Browser 8.5a10 --- -link: https://blog.torproject.org/new-release-tor-browser-85a7 +image: /static/images/tor-browser_release.png +--- +link: https://blog.torproject.org/new-release-tor-browser-85a10 --- summary: -Tor Browser 8.5a7 is now available from the Tor Browser Project page and also from our distribution directory. - -This release features important security updates to Firefox. +Tor Browser 8.5a10 is now available from the Tor Browser Project page and also from our distribution directory. --- body: diff --git a/content/press/new-release-tor/contents.lr b/content/press/new-release-tor/contents.lr index b20fa4c..e0a4bc1 100644 --- a/content/press/new-release-tor/contents.lr +++ b/content/press/new-release-tor/contents.lr @@ -8,6 +8,8 @@ type: release --- title: New Release: Tor 0.4.0.1-alpha --- +image: /static/images/tor_release.png +--- link: https://blog.torproject.org/new-release-tor-0401-alpha --- summary: diff --git a/templates/macros/press.html b/templates/macros/press.html index 27707bf..40f109e 100644 --- a/templates/macros/press.html +++ b/templates/macros/press.html @@ -1,6 +1,6 @@ {% macro render_release(item, alternative) %} <div class="card mx-auto" style="width: 365px; height: 485px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> + <img class="card-img-top" src="{{ item.image|asseturl }}" alt="Card image cap"> <div class="card-body"> <div class="card-title"> <a class="h4 text-primary" href="{{ item.link }}">{{ item.title }}</a> diff --git a/templates/meta.html b/templates/meta.html index 714897e..0bf3d3f 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -9,7 +9,7 @@ <meta property="og:url" content="https://torproject.org" /> <meta property="og:title" content="The Tor Project | Privacy & Freedom Online" /> <meta property="og:description" content="Defend yourself against tracking and surveillance. Circumvent censorship." /> -<meta property="og:image" content="" /> +<meta property="og:image" content="{{ '/static/images/tor-project-logo-onions.png'|asseturl }}" /> <link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet">

1 0

[newsletter/master] Add htaccess
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 055107aae9390d1edb3cf09faa0e02f938ada90e Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 18:27:31 2019 +0100 Add htaccess --- .htaccess | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..e69de29

1 0

[styleguide/master] Add htaccess
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 3235799db4fc752c33ef94e36981b11a69122930 Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 18:24:54 2019 +0100 Add htaccess --- .htaccess | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..e69de29

1 0

[tor-browser-build/maint-8.0] Bug 29868: Fix installation of python-future package
by gk＠torproject.org 26 Mar '19

26 Mar '19

commit abf8e5043de3b69bf29b641751b5d73852c08b4e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 26 12:01:18 2019 +0100 Bug 29868: Fix installation of python-future package The jessie-backports suite has been removed from ftp.debian.org, so we now download and install the package using snapshot.debian.org. --- projects/tor-browser/config | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index c0f5123..6aa3c66 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -29,12 +29,15 @@ targets: - genisoimage - faketime windows: + pre: | + # Bug 29868: jessie-backports don't exist anymore, so we download the + # package we need from snapshot.debian.org + # We can remove this when we switch to Stretch (bug 29307) + DEBIAN_FRONTEND=noninteractive dpkg -i python-future_*_all.deb var: arch_deps: - - python-future - pre_pkginst: | - # enable jessie-backports for python-future - echo 'deb http://ftp.debian.org/debian jessie-backports main' >> /etc/apt/sources.list + # python-configparser is required by python-future + - python-configparser windows-i686: var: mar_osname: win32 @@ -95,3 +98,10 @@ input_files: URL: https://files.pythonhosted.org/packages/7e/9b/f99171190f04cd23768547dd34533… sha256sum: 675c35ee0e1677db9e80d2f48d8a7ff2cf38e6207e8cd5e2a2c6d126db025854 enable: '[% c("var/windows") %]' + # Bug 29868: jessie-backports don't exist anymore, so we download the + # package we need from snapshot.debian.org + # We can remove this when we switch to Stretch (bug 29307) + - name: python-future + URL: https://snapshot.debian.org/archive/debian/20190104T031048Z/pool/main/p/pyt… + sha256sum: da39bbc41a6143f68eb7b8d774aad8fe2483947c4e567c9b27f6a8455981450d + enable: '[% c("var/windows") %]'

1 0

[tor-browser-build/master] Bug 29868: Fix installation of python-future package
by gk＠torproject.org 26 Mar '19

26 Mar '19

commit f2e272082fc484f211e0539dc177b1948c4b5d68 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 26 12:01:18 2019 +0100 Bug 29868: Fix installation of python-future package The jessie-backports suite has been removed from ftp.debian.org, so we now download and install the package using snapshot.debian.org. --- projects/tor-browser/config | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 22d99c6..0a82092 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -32,12 +32,15 @@ targets: - genisoimage - faketime windows: + pre: | + # Bug 29868: jessie-backports don't exist anymore, so we download the + # package we need from snapshot.debian.org + # We can remove this when we switch to Stretch (bug 29307) + DEBIAN_FRONTEND=noninteractive dpkg -i python-future_*_all.deb var: arch_deps: - - python-future - pre_pkginst: | - # enable jessie-backports for python-future - echo 'deb http://ftp.debian.org/debian jessie-backports main' >> /etc/apt/sources.list + # python-configparser is required by python-future + - python-configparser windows-i686: var: mar_osname: win32 @@ -116,6 +119,13 @@ input_files: URL: https://files.pythonhosted.org/packages/7e/9b/f99171190f04cd23768547dd34533… sha256sum: 675c35ee0e1677db9e80d2f48d8a7ff2cf38e6207e8cd5e2a2c6d126db025854 enable: '[% c("var/windows") %]' + # Bug 29868: jessie-backports don't exist anymore, so we download the + # package we need from snapshot.debian.org + # We can remove this when we switch to Stretch (bug 29307) + - name: python-future + URL: https://snapshot.debian.org/archive/debian/20190104T031048Z/pool/main/p/pyt… + sha256sum: da39bbc41a6143f68eb7b8d774aad8fe2483947c4e567c9b27f6a8455981450d + enable: '[% c("var/windows") %]' # To generate a new keystore, see how-to-generate-keystore.txt - filename: android-qa.keystore enable: '[% c("var/android") %]'

1 0

[tpo/master] Edit verify signature link
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit b52ec2d6ebe4e2fac68cbcc59a5b5c4c00a210bd Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 18:10:10 2019 +0100 Edit verify signature link --- templates/download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/download.html b/templates/download.html index 5966747..48f0b53 100644 --- a/templates/download.html +++ b/templates/download.html @@ -45,7 +45,7 @@ </div> <div class="container justify-content-center mt-4"> <div class="row justify-content-center"> - <i class="fas fa-signature display-5 text-primary pr-3"></i><p class="text-primary text-tpo"><a class="mx-auto" href="https://support.torproject.org/how-to-verify-signature" target="_blank"><u>{{ _('Verify Tor Browser signature') }}</u></a></p> + <i class="fas fa-signature display-5 text-primary pr-3"></i><p class="text-primary text-tpo"><a class="mx-auto" href="https://support.torproject.org/tbb/how-to-verify-signature/" target="_blank"><u>{{ _('Verify Tor Browser signature') }}</u></a></p> </div> </div> <div class="container">

1 0

[tpo/master] Update download alpha link
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 71b4f29e11686d22a3c801e27919cfe588fb4dbf Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 18:01:48 2019 +0100 Update download alpha link --- content/download/{options => alpha}/contents.lr | 0 templates/hero-download.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/content/download/options/contents.lr b/content/download/alpha/contents.lr similarity index 100% rename from content/download/options/contents.lr rename to content/download/alpha/contents.lr diff --git a/templates/hero-download.html b/templates/hero-download.html index 3425c1c..6f31fd0 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -36,7 +36,7 @@ </div> <div class="row p-5"> <a class="mx-auto text-white py-3" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language') }}</u></a> - <a class="mx-auto text-white py-3" href="{{ 'options'|url(alt=this.alt) }}"><u>{{ _('Advanced Install Options') }}</u></a> + <a class="mx-auto text-white py-3" href="{{ 'alpha'|url(alt=this.alt) }}"><u>{{ _('Advanced Install Options') }}</u></a> </div> <div class="hidden-sm row p-5 justify-content-center window-bg"> <a class="mx-auto text-white text-center py-5" href="https://blog.torproject.org/category/tags/tor-browser"><u>{{ _('Read the latest release announcements') }}</u></a>

1 0

[tpo/master] Fix templates
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit a94ae8c797d80c9b940a0230a69468a9d6085ef8 Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 17:40:01 2019 +0100 Fix templates --- templates/sponsors.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/sponsors.html b/templates/sponsors.html index b0c93b0..b67432d 100644 --- a/templates/sponsors.html +++ b/templates/sponsors.html @@ -33,7 +33,7 @@ <div class="row border-bottom border-light"><p></p></div> <div class="row py-5"> <p>{{ _('This sponsors page is based upon un-audited and un-reviewed financial and in-kind donations, contract, and other data.') }}</p> - <p><a href="about/reports" title="Reports"><u>{{ _('Further details about our audited and reviewed funding can be found with our Financial Reports.') }}</u></a><p> + <p><a href="{{ '/about/reports'|url(alt=this.alt) }}" title="Reports"><u>{{ _('Further details about our audited and reviewed funding can be found with our Financial Reports.') }}</u></a><p> </div> </div> </div>

1 0

[tpo/master] Fix typo in navbar
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 77c3d8dece38b90ba9a94f04331c44a22ac0ad5c Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 17:25:58 2019 +0100 Fix typo in navbar --- templates/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/navbar.html b/templates/navbar.html index 6bc92c2..95bb0e5 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -42,7 +42,7 @@ {% else %} <button type="button" class="btn btn-dark bg-dark dropdown-toggle btn-block my-3 my-sm-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> {% endif %} - { bag('alternatives', this.alt, 'language') }} + {{ bag('alternatives', this.alt, 'language') }} </button> <div class="dropdown-menu"> {% for id, item in bag('alternatives').items() %}

1 0

[tpo/master] Update template for download page
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 67530d6632e294b96b2dd09ef359c662d8c9fdf1 Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 16:59:25 2019 +0100 Update template for download page --- templates/macros/downloads.html | 4 ++-- templates/navbar.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html index a080cf2..6bddbb0 100644 --- a/templates/macros/downloads.html +++ b/templates/macros/downloads.html @@ -8,7 +8,7 @@ {% set sig_link_64 = download_link_64 + '.asc' %} {% set sig_link_32 = download_link_32 + '.asc' %} - <a class="downloadLink" href="{{ download_link_32 }}">32-bit</a> (<a href="{{ sig_link_32 }}">sig</a>) / <a href="{{ download_link_32 }}">64-bit</a> (<a href="{{ sig_link_64 }}">sig<a/>) + <a class="downloadLink" href="{{ download_link_32 }}">32-bit</a> (<a href="{{ sig_link_32 }}">sig</a>) / <a href="{{ download_link_64 }}">64-bit</a> (<a href="{{ sig_link_64 }}">sig<a/>) {% endmacro %} {% macro render_mac(version, alt) %} @@ -32,7 +32,7 @@ {% set sig_link_64 = download_link_64 + '.asc' %} {% set sig_link_32 = download_link_32 + '.asc' %} - <a class="downloadLink" href="{{ download_link_32 }}">32-bit</a> (<a href="{{ sig_link_32 }}">sig</a>) / <a href="{{ download_link_32 }}">64-bit</a> (<a href="{{ sig_link_64 }}">sig<a/>) + <a class="downloadLink" href="{{ download_link_32 }}">32-bit</a> (<a href="{{ sig_link_32 }}">sig</a>) / <a href="{{ download_link_64 }}">64-bit</a> (<a href="{{ sig_link_64 }}">sig<a/>) {% endmacro %} {% macro render_fdroid() %} diff --git a/templates/navbar.html b/templates/navbar.html index 9b708eb..6bc92c2 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -42,7 +42,7 @@ {% else %} <button type="button" class="btn btn-dark bg-dark dropdown-toggle btn-block my-3 my-sm-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> {% endif %} - {{ bag('alternatives', this.alt, 'language') }} + { bag('alternatives', this.alt, 'language') }} </button> <div class="dropdown-menu"> {% for id, item in bag('alternatives').items() %}

1 0