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

[tpo/develop] Replace tag FISCAL YEAR to AUDIT. See #29945
by hiro＠torproject.org 13 Sep '19

13 Sep '19

commit 0d59eb9d40d91e05ef060f802861153b0221361e Author: gus <gus(a)torproject.org> Date: Thu Sep 12 09:58:24 2019 -0400 Replace tag FISCAL YEAR to AUDIT. See #29945 --- content/about/reports/2011-form-pc/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/reports/2011-form-pc/contents.lr b/content/about/reports/2011-form-pc/contents.lr index 7d5b541..3eda11d 100644 --- a/content/about/reports/2011-form-pc/contents.lr +++ b/content/about/reports/2011-form-pc/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2011 --- -tags: FISCAL YEAR +tags: AUDIT --- title: 2011 State of MA Form PC ---

1 0

[tpo/develop] Replace tag AUDIT to FISCAL YEAR
by hiro＠torproject.org 13 Sep '19

13 Sep '19

commit 68a9326a1b5ab14a38729452c067668c499e0806 Author: gus <gus(a)torproject.org> Date: Thu Sep 12 10:07:06 2019 -0400 Replace tag AUDIT to FISCAL YEAR --- content/about/reports/2009-data-collection/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/reports/2009-data-collection/contents.lr b/content/about/reports/2009-data-collection/contents.lr index 080db2f..2a25a2d 100644 --- a/content/about/reports/2009-data-collection/contents.lr +++ b/content/about/reports/2009-data-collection/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2009 --- -tags: AUDIT +tags: FISCAL YEAR --- title: 2009 Dept of Commerce Data Collection Form ---

1 0

[tpo/develop] #29945 - Replace tag to AUDIT
by hiro＠torproject.org 13 Sep '19

13 Sep '19

commit 3f8d1d53b11a7aef8489ad6eb77cda23f6c5dd81 Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Thu Sep 12 13:29:06 2019 +0000 #29945 - Replace tag to AUDIT --- content/about/reports/2012-financial-statements/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/reports/2012-financial-statements/contents.lr b/content/about/reports/2012-financial-statements/contents.lr index 602957b..a04ab21 100644 --- a/content/about/reports/2012-financial-statements/contents.lr +++ b/content/about/reports/2012-financial-statements/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2012 --- -tags: FISCAL YEAR +tags: AUDIT --- title: 2012 Financial Statements ---

1 0

[tpo/develop] Add tag IRS 990 in 2010 IRS Form 990, see #29945
by hiro＠torproject.org 13 Sep '19

13 Sep '19

commit 645e2fea04db114b0eb760e069a4dc48116926d3 Author: gus <gus(a)torproject.org> Date: Thu Sep 12 10:04:48 2019 -0400 Add tag IRS 990 in 2010 IRS Form 990, see #29945 --- content/about/reports/2010-irs-form-990/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/reports/2010-irs-form-990/contents.lr b/content/about/reports/2010-irs-form-990/contents.lr index c8eac6b..6314ff1 100644 --- a/content/about/reports/2010-irs-form-990/contents.lr +++ b/content/about/reports/2010-irs-form-990/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2010 --- -tags: AUDIT +tags: AUDIT, IRS 990 --- title: 2010 IRS Form 990, State of MA Form PC, and Independent Audit Results ---

1 0

[tpo/develop] give arma a pronoun
by hiro＠torproject.org 13 Sep '19

13 Sep '19

commit 56e8a89203256132f1094157f97c74004399e652 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 13 11:46:46 2019 -0400 give arma a pronoun --- content/about/people/arma/contents.lr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/about/people/arma/contents.lr b/content/about/people/arma/contents.lr index 8175b6f..75e1327 100644 --- a/content/about/people/arma/contents.lr +++ b/content/about/people/arma/contents.lr @@ -8,6 +8,8 @@ name: Roger Dingledine --- nickname: arma --- +pronoun: he +--- twitter_handle: RogerDingledine --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=B1172656DFF983C3042BC699…

1 0

[tpo/develop] Fix Juga's GPG url
by hiro＠torproject.org 13 Sep '19

13 Sep '19

commit 328c440497fdc9a2b1c2782ac8048f580d4c8330 Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Fri Sep 13 09:47:44 2019 +0000 Fix Juga's GPG url --- content/about/people/juga/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/people/juga/contents.lr b/content/about/people/juga/contents.lr index 9ce3915..1cfcf40 100644 --- a/content/about/people/juga/contents.lr +++ b/content/about/people/juga/contents.lr @@ -8,7 +8,7 @@ name: juga --- nickname: juga --- -gpg: https://juga.space/files/juga.asct +gpg: https://juga.space/files/juga.asc --- image: /static/images/people/juga.png ---

1 0

[tpo/develop] Fix tag style
by hiro＠torproject.org 13 Sep '19

13 Sep '19

commit a8b118c997eacecf05bb24c0fbd92383d6bda9c5 Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Fri Sep 13 09:43:19 2019 +0000 Fix tag style --- content/about/reports/2010-irs-form-990/contents.lr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/about/reports/2010-irs-form-990/contents.lr b/content/about/reports/2010-irs-form-990/contents.lr index 6314ff1..2c7329c 100644 --- a/content/about/reports/2010-irs-form-990/contents.lr +++ b/content/about/reports/2010-irs-form-990/contents.lr @@ -4,7 +4,9 @@ type: report --- date: 2010 --- -tags: AUDIT, IRS 990 +tags: +IRS 990 +AUDIT --- title: 2010 IRS Form 990, State of MA Form PC, and Independent Audit Results ---

1 0

[tpo/develop] Add climate banner style and stuff
by hiro＠torproject.org 13 Sep '19

13 Sep '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/develop] Merge branch 'master' into develop
by hiro＠torproject.org 13 Sep '19

13 Sep '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

[tpo/develop] Add banner to templates
by hiro＠torproject.org 13 Sep '19

13 Sep '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