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

[tpo/staging] Update lego
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 851a292520feaffdee62ae984359a2d3f01bc88b Author: hiro <hiro(a)torproject.org> Date: Wed Oct 30 17:20:34 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index c147645..8a4ddc7 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit c1476450e4f545f9808fbe48660d71cb3a803b23 +Subproject commit 8a4ddc76122db1b60a2ed2b0217c49b7ad77f3d5

1 0

[tpo/staging] Set Tor Browser for Android version to 9.0
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 2cc3704793981f9719a11f4dd28cb867a6b5edb7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Nov 5 21:36:00 2019 +0100 Set Tor Browser for Android version to 9.0 We should revert this commit when 9.0.1 is available for Android. --- databags/versions.ini | 3 +++ templates/download-android.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 519d734..d823f35 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -2,6 +2,9 @@ version = 9.0.1 win32 = 0.4.1.6 +[torbrowser-stable-android] +version = 9.0 + [torbrowser-alpha] version = 9.5a1 diff --git a/templates/download-android.html b/templates/download-android.html index bcb8fcc..7e83481 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -16,7 +16,7 @@ </div> <div class="row my-5"> <div class="col-xl-6 mx-auto text-center"> - {% set t = bag('versions', 'torbrowser-stable') %} + {% set t = bag('versions', 'torbrowser-stable-android') %} <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">aarch64</small></a> <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk.asc"><small>sig</small></a>

1 0

[tpo/staging] Add new Tor Browser version: 9.0.1
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 1ac553fea68104e99cc7665c99ade584e5d8315d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Nov 5 21:34:15 2019 +0100 Add new Tor Browser version: 9.0.1 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ++++ databags/versions.ini | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 712a3f8..8587823 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -9,6 +9,10 @@ body: "9.0-MacOS", "9.0-Linux", "9.0-Windows", +"9.0.1", +"9.0.1-MacOS", +"9.0.1-Linux", +"9.0.1-Windows", "9.5a1", "9.5a1-MacOS", "9.5a1-Linux", diff --git a/databags/versions.ini b/databags/versions.ini index ea163b3..519d734 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,5 +1,5 @@ [torbrowser-stable] -version = 9.0 +version = 9.0.1 win32 = 0.4.1.6 [torbrowser-alpha]

1 0

[tpo/staging] Merge branch 'master' into staging
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 4ba8a9e6c95ea5e93d6eb0c42cff18699d560f65 Merge: 5631c01 ac54958 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Nov 6 11:04:30 2019 +0100 Merge branch 'master' into staging .htaccess | 6 +- assets/static/images/home/png/take-back(a)3x.png | Bin 0 -> 124543 bytes assets/static/images/home/svg/take-back.svg | 7902 ++++++++++++++++++++ content/about/history/contents.lr | 4 +- .../about/jobs/backend-engineer-ooni/contents.lr | 2 + content/about/jobs/browser-developer/contents.lr | 2 + .../jobs/developer-data-architect/contents.lr | 2 + .../jobs/senior-system-administrator/contents.lr | 2 + .../jobs/shadow-simulation-developer/contents.lr | 2 + .../torbrowser/RecommendedTBBVersions/contents.lr | 28 +- databags/download-alternatives.ini | 8 + databags/versions.ini | 10 +- lego | 2 +- models/job.ini | 4 + templates/about.html | 4 - templates/banner.html | 1 + templates/bottom_banner.html | 1 - templates/download-android.html | 10 +- templates/download-languages.html | 6 +- templates/download-options.html | 10 +- templates/download-tor.html | 10 +- templates/homepage.html | 9 +- templates/layout.html | 8 +- templates/meta.html | 7 +- 24 files changed, 7979 insertions(+), 61 deletions(-)

1 0

[tpo/staging] make more strings translatable on the templates folder
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit ac549585e12b45629280a289559a0277a8c522c5 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Nov 6 11:03:12 2019 +0100 make more strings translatable on the templates folder --- templates/download-languages.html | 6 +++--- templates/download-options.html | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/download-languages.html b/templates/download-languages.html index 2fd0372..4f7ec02 100644 --- a/templates/download-languages.html +++ b/templates/download-languages.html @@ -9,9 +9,9 @@ <thead> <tr> <th scope="col">{{ _('Language') }}</th> - <th scope="col">Windows</th> - <th scope="col">macOS</th> - <th scope="col">GNU/Linux</th> + <th scope="col">{{ _('Windows') }}</th> + <th scope="col">{{ _('macOS') }}</th> + <th scope="col">{{ _('GNU/Linux') }}</th> </tr> </thead> <tbody> diff --git a/templates/download-options.html b/templates/download-options.html index 075b158..0b8e663 100644 --- a/templates/download-options.html +++ b/templates/download-options.html @@ -9,9 +9,9 @@ <thead> <tr> <th scope="col">{{ _('Language') }}</th> - <th scope="col">Windows</th> - <th scope="col">MacOS</th> - <th scope="col">GNU/Linux</th> + <th scope="col">{{ _('Windows') }}</th> + <th scope="col">{{ _('MacOS') }}</th> + <th scope="col">{{ _('GNU/Linux') }}</th> </tr> </thead> <tbody> @@ -40,13 +40,13 @@ <table class="table"> <thead> <tr> - <th>Tor Browser for Android Alpha</th> + <th>{{ _('Tor Browser for Android Alpha') }}</th> </tr> </thead> <tbody> <tr> <td> - <a href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">Google Play</a> + <a href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Google Play') }}</a> </td> </tr> {% from "macros/downloads.html" import render_android %}

1 0

[tpo/staging] fix sajolida's pronoun link
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 69e98c95e7f7d0b36902278a25573d667fd1dd7d Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Sep 15 13:41:49 2019 -0400 fix sajolida's pronoun link --- content/about/people/sajolida/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/people/sajolida/contents.lr b/content/about/people/sajolida/contents.lr index 56e6644..cddc3bc 100644 --- a/content/about/people/sajolida/contents.lr +++ b/content/about/people/sajolida/contents.lr @@ -8,7 +8,7 @@ name: sajolida --- nickname: sajolida --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: /static/keys/sajolida.txt ---

1 0

[tpo/staging] Add space between IRC and nickname
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit c0e38968acb4cf2b685e7f1ea1a744e9dccad1a6 Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Sun Sep 15 21:19:25 2019 +0000 Add space between IRC and nickname --- templates/macros/people.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/macros/people.html b/templates/macros/people.html index 79afc6f..1a4d7d1 100644 --- a/templates/macros/people.html +++ b/templates/macros/people.html @@ -41,7 +41,7 @@ <h6 class="nick text-primary m-0"><a href="https://pronoun.is/{{ item.pronoun }}">pronoun.is/{{ item.pronoun }}</a></h6> {% endif %} {% if item.nickname %} - <label class="nick text-primary">IRC:{{ item.nickname }}</label> + <label class="nick text-primary">IRC: {{ item.nickname }}</label> {% endif %} {{ item.description }} </div>

1 0

[tpo/staging] Add banner to templates
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 980220d9cbda113827575018e868556ab6ad80ca Author: hiro <hiro(a)torproject.org> Date: Fri Sep 13 22:26:31 2019 +0200 Add banner to templates --- templates/homepage.html | 1 + templates/layout.html | 1 + templates/meta.html | 1 + 3 files changed, 3 insertions(+) diff --git a/templates/homepage.html b/templates/homepage.html index 25ba0ba..fd09888 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -25,4 +25,5 @@ <footer> {% include 'footer.html' %} </footer> + {% include 'bottom_banner.html' %} </body> diff --git a/templates/layout.html b/templates/layout.html index db1168f..6172b4d 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -19,5 +19,6 @@ <footer> {% include 'footer.html' %} </footer> + {% include 'bottom_banner.html' %} </body> </html> diff --git a/templates/meta.html b/templates/meta.html index 8601988..04b9e93 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -11,6 +11,7 @@ <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="https://www.torproject.org/static/images/tor-project-logo-onions.png" /> +<link rel="stylesheet" href="{{ '/static/css/digital-climate-strike/main.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title>

1 0

[tpo/staging] Add climate banner style and stuff
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 9cd7a5708dee56969901a9908c85590c9b317265 Author: hiro <hiro(a)torproject.org> Date: Fri Sep 13 22:22:57 2019 +0200 Add climate banner style and stuff --- assets/static/images/dcs-logo.png | Bin 0 -> 10135 bytes lego | 2 +- templates/bottom_banner.html | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/static/images/dcs-logo.png b/assets/static/images/dcs-logo.png new file mode 100644 index 0000000..d3bd1ff Binary files /dev/null and b/assets/static/images/dcs-logo.png differ diff --git a/lego b/lego index 3d80025..77fc882 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 3d8002591b1a6df64e27624bd08d7a91d8e4c763 +Subproject commit 77fc882c7f54abb72c81d6fcd8c2fcc88e32781c diff --git a/templates/bottom_banner.html b/templates/bottom_banner.html new file mode 120000 index 0000000..71f1dc9 --- /dev/null +++ b/templates/bottom_banner.html @@ -0,0 +1 @@ +../lego/templates/bottom_banner.html \ No newline at end of file

1 0

[tpo/staging] Merge branch 'master' into develop
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit a7bfcae251c944623e98c99677d6192248a1a682 Merge: 56e8a89 9cd7a57 Author: hiro <hiro(a)torproject.org> Date: Fri Sep 13 22:23:10 2019 +0200 Merge branch 'master' into develop assets/static/images/dcs-logo.png | Bin 0 -> 10135 bytes lego | 2 +- templates/bottom_banner.html | 1 + 3 files changed, 2 insertions(+), 1 deletion(-)

1 0