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

[tpo/staging] Merge commit '39e050aeaeb811bd24de210a157bb6b49ad4c6bd' into staging
by hiro＠torproject.org 27 Nov '19

27 Nov '19

commit cf8d58f7b77491070074f3b6e274640980c43e68 Merge: e723575 39e050a Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 13:48:28 2019 +0100 Merge commit '39e050aeaeb811bd24de210a157bb6b49ad4c6bd' into staging templates/homepage.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tpo/staging] Add acute to people page
by hiro＠torproject.org 27 Nov '19

27 Nov '19

commit 645c40723aadfc83010b1a7535a56ff6facac4df Author: Ana Custura <ana(a)netstat.org.uk> Date: Sat Nov 23 19:53:27 2019 +0000 Add acute to people page --- assets/static/images/people/acute.png | Bin 0 -> 43888 bytes assets/static/images/people/orig/acute.jpg | Bin 0 -> 33472 bytes content/about/people/acute/contents.lr | 19 +++++++++++++++++++ 3 files changed, 19 insertions(+) diff --git a/assets/static/images/people/acute.png b/assets/static/images/people/acute.png new file mode 100644 index 0000000..f319eb5 Binary files /dev/null and b/assets/static/images/people/acute.png differ diff --git a/assets/static/images/people/orig/acute.jpg b/assets/static/images/people/orig/acute.jpg new file mode 100644 index 0000000..4c56905 Binary files /dev/null and b/assets/static/images/people/orig/acute.jpg differ diff --git a/content/about/people/acute/contents.lr b/content/about/people/acute/contents.lr new file mode 100644 index 0000000..a6d5ba8 --- /dev/null +++ b/content/about/people/acute/contents.lr @@ -0,0 +1,19 @@ +_model: person +--- +_hidden: yes +--- +role: core +--- +name: Ana +--- +nickname: acute +--- +pronoun: she +--- +gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=85E7AAB8C29DF38349405DC0… +--- +image: /static/images/people/acute.png +--- +description: + +[Metrics team contributor](https://metrics.torproject.org/), working on the development and automated deployment of [Onionperf](https://onionperf.torproject.org/onionperf.html).

1 0

[tpo/staging] Modify homepage to account for ltr locales
by hiro＠torproject.org 27 Nov '19

27 Nov '19

commit c280adbe4e53fc7feddebec89e2d56d5217787c6 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 13:57:05 2019 +0100 Modify homepage to account for ltr locales --- lego | 2 +- templates/homepage.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lego b/lego index 3409e3e..f9f1591 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 3409e3eebc2ffca079bf890b5ecb5add6fceccbc +Subproject commit f9f1591892c374ae037f442dad78e366abed4364 diff --git a/templates/homepage.html b/templates/homepage.html index 52e41a2..4eb22be 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -11,7 +11,7 @@ <main role="main" class="mx-auto col-12 {{ locale.order }} {{ locale.direction }}"> {% include this.html %} {% if this.parent.path != "/download" %} - <div class="container pt-5 hero"> + <div class="container pt-5 hero {{ locale.order }} {{ locale.direction }}"> {% block body %}{% endblock %} </div> {% endif %}

1 0

[tpo/staging] Merge remote-tracking branch 'acute/add-acute'
by hiro＠torproject.org 27 Nov '19

27 Nov '19

commit f82d82899f4ba266384d54cee012925c4e64045c Merge: 22ad2b6 645c407 Author: emma peel <emma.peel(a)riseup.net> Date: Mon Nov 25 20:52:50 2019 +0100 Merge remote-tracking branch 'acute/add-acute' assets/static/images/people/acute.png | Bin 0 -> 43888 bytes assets/static/images/people/orig/acute.jpg | Bin 0 -> 33472 bytes content/about/people/acute/contents.lr | 19 +++++++++++++++++++ 3 files changed, 19 insertions(+)

1 0

[tpo/staging] More ltr-rtl fixes
by hiro＠torproject.org 27 Nov '19

27 Nov '19

commit 39e050aeaeb811bd24de210a157bb6b49ad4c6bd Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 13:45:50 2019 +0100 More ltr-rtl fixes --- templates/homepage.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/homepage.html b/templates/homepage.html index 4daff16..52e41a2 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -5,9 +5,9 @@ {% include 'hero.html' %} </div> </div> - <div class="container-fluid"> - <div class="row flex-xl-nowrap"> - {% set locale = bag('alternatives', this.alt) %} + {% set locale = bag('alternatives', this.alt) %} + <div class="container-fluid {{ locale.order }} {{ locale.direction }}"> + <div class="row flex-xl-nowrap {{ locale.order }} {{ locale.direction }}"> <main role="main" class="mx-auto col-12 {{ locale.order }} {{ locale.direction }}"> {% include this.html %} {% if this.parent.path != "/download" %}

1 0

[tpo/staging] More ltr-rtl fixes
by hiro＠torproject.org 27 Nov '19

27 Nov '19

commit 55ad9e7dd23cc46480e63da2e327c80c98fff0db Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 13:45:50 2019 +0100 More ltr-rtl fixes --- templates/homepage.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/homepage.html b/templates/homepage.html index 4daff16..52e41a2 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -5,9 +5,9 @@ {% include 'hero.html' %} </div> </div> - <div class="container-fluid"> - <div class="row flex-xl-nowrap"> - {% set locale = bag('alternatives', this.alt) %} + {% set locale = bag('alternatives', this.alt) %} + <div class="container-fluid {{ locale.order }} {{ locale.direction }}"> + <div class="row flex-xl-nowrap {{ locale.order }} {{ locale.direction }}"> <main role="main" class="mx-auto col-12 {{ locale.order }} {{ locale.direction }}"> {% include this.html %} {% if this.parent.path != "/download" %}

1 0

[tpo/staging] Merge commit '7c2839d2c8bd959f9619878631d1d9ebe7b522ef' into staging
by hiro＠torproject.org 27 Nov '19

27 Nov '19

commit be106d457b841bbdf8a651ec76e3363c894aa8a8 Merge: f8c448b 7c2839d Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 14:17:00 2019 +0100 Merge commit '7c2839d2c8bd959f9619878631d1d9ebe7b522ef' into staging assets/static/images/people/acute.png | Bin 0 -> 43888 bytes assets/static/images/people/orig/acute.jpg | Bin 0 -> 33472 bytes content/about/people/acute/contents.lr | 19 +++++++++++++++++++ lego | 2 +- 4 files changed, 20 insertions(+), 1 deletion(-)

1 0

[tpo/staging] Modify homepage to account for ltr locales
by hiro＠torproject.org 27 Nov '19

27 Nov '19

commit 5510c38e3ae8ed5843e1134921dd031877e09de0 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 13:57:05 2019 +0100 Modify homepage to account for ltr locales --- lego | 2 +- templates/homepage.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lego b/lego index 3409e3e..f9f1591 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 3409e3eebc2ffca079bf890b5ecb5add6fceccbc +Subproject commit f9f1591892c374ae037f442dad78e366abed4364 diff --git a/templates/homepage.html b/templates/homepage.html index 52e41a2..4eb22be 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -11,7 +11,7 @@ <main role="main" class="mx-auto col-12 {{ locale.order }} {{ locale.direction }}"> {% include this.html %} {% if this.parent.path != "/download" %} - <div class="container pt-5 hero"> + <div class="container pt-5 hero {{ locale.order }} {{ locale.direction }}"> {% block body %}{% endblock %} </div> {% endif %}

1 0

[tpo/staging] Update lego
by hiro＠torproject.org 27 Nov '19

27 Nov '19

commit 7c2839d2c8bd959f9619878631d1d9ebe7b522ef Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 14:04:23 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index f9f1591..7c0e9ee 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit f9f1591892c374ae037f442dad78e366abed4364 +Subproject commit 7c0e9ee42a4cdef87ebb8eefa7dde2df89403c94

1 0

[tpo/staging] Merge commit 'c280adbe4e53fc7feddebec89e2d56d5217787c6' into staging
by hiro＠torproject.org 27 Nov '19

27 Nov '19

commit f8c448b20a7dfdd036c526a21325b59ef8456c3a Merge: cf8d58f c280adb Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 13:57:55 2019 +0100 Merge commit 'c280adbe4e53fc7feddebec89e2d56d5217787c6' into staging lego | 2 +- templates/homepage.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0