tor-commits January 2019

tor-commits@lists.torproject.org

15 participants
2081 discussions

[tpo/staging] Edit tag color with databag
by hiro＠torproject.org 22 Jan '19

22 Jan '19

commit cf3182de7df8e6ae28aad8f27356b121222b293b Author: hiro <hiro(a)torproject.org> Date: Tue Jan 22 16:39:27 2019 +0100 Edit tag color with databag --- content/about/reports/2007-irs-form-990/contents.lr | 2 +- content/about/reports/2008-financial-statements/contents.lr | 2 +- content/about/reports/2008-irs-form-990/contents.lr | 2 +- content/about/reports/2009-annual-report/contents.lr | 2 +- content/about/reports/2009-data-collection/contents.lr | 2 +- content/about/reports/2009-financial-statements/contents.lr | 2 +- content/about/reports/2009-irs-form-990/contents.lr | 2 +- content/about/reports/2010-irs-form-990/contents.lr | 2 +- content/about/reports/2011-data-collection/contents.lr | 2 +- content/about/reports/2011-financial-statements/contents.lr | 2 +- content/about/reports/2011-form-pc/contents.lr | 2 +- content/about/reports/2011-irs-form-990/contents.lr | 2 +- content/about/reports/2012-annual-report/contents.lr | 2 +- content/about/reports/2012-financial-statements/contents.lr | 2 +- content/about/reports/2012-form-pc/contents.lr | 2 +- content/about/reports/2012-irs-form-990/contents.lr | 2 +- content/about/reports/2013-financial-statements/contents.lr | 2 +- content/about/reports/2013-form-pc/contents.lr | 2 +- content/about/reports/2013-irs-form-990/contents.lr | 2 +- content/about/reports/2014-irs-form-990/contents.lr | 4 +++- content/about/reports/2015-irs-form-990/contents.lr | 4 +++- .../about/reports/2016-12-05-tor-project-bylaws/contents.lr | 2 +- content/about/reports/2016-irs-form-990/contents.lr | 4 +++- content/about/reports/2017-irs-form-990/contents.lr | 2 +- databags/tags.ini | 11 +++++++++++ templates/macros/reports.html | 4 +++- 26 files changed, 44 insertions(+), 25 deletions(-) diff --git a/content/about/reports/2007-irs-form-990/contents.lr b/content/about/reports/2007-irs-form-990/contents.lr index cf8c80c..e781fd6 100644 --- a/content/about/reports/2007-irs-form-990/contents.lr +++ b/content/about/reports/2007-irs-form-990/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2007 --- -tags: Fiscal Year 2007 +tags: IRS 990 --- title: 2007 IRS Form 990 --- diff --git a/content/about/reports/2008-financial-statements/contents.lr b/content/about/reports/2008-financial-statements/contents.lr index f124392..0776be5 100644 --- a/content/about/reports/2008-financial-statements/contents.lr +++ b/content/about/reports/2008-financial-statements/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2008 --- -tags: Fiscal Year 2008 +tags: AUDIT --- title: 2008 Financial Statements and Audit Results --- diff --git a/content/about/reports/2008-irs-form-990/contents.lr b/content/about/reports/2008-irs-form-990/contents.lr index 0e64a97..06fc1f5 100644 --- a/content/about/reports/2008-irs-form-990/contents.lr +++ b/content/about/reports/2008-irs-form-990/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2008 --- -tags: Fiscal Year 2008 +tags: IRS 990 --- title: 2008 IRS Form 990 --- diff --git a/content/about/reports/2009-annual-report/contents.lr b/content/about/reports/2009-annual-report/contents.lr index 5e20c5e..78e32ab 100644 --- a/content/about/reports/2009-annual-report/contents.lr +++ b/content/about/reports/2009-annual-report/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2009 --- -tags: Fiscal Year 2009 +tags: FISCAL YEAR --- title: 2009 Annual Report --- diff --git a/content/about/reports/2009-data-collection/contents.lr b/content/about/reports/2009-data-collection/contents.lr index 4b25dd5..ffa897e 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: Fiscal Year 2009 +tags: AUDIT --- title: 2009 Dept of Commerce Data Collection Form --- diff --git a/content/about/reports/2009-financial-statements/contents.lr b/content/about/reports/2009-financial-statements/contents.lr index f7c4d67..2a8f57e 100644 --- a/content/about/reports/2009-financial-statements/contents.lr +++ b/content/about/reports/2009-financial-statements/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2009 --- -tags: Fiscal Year 2009 +tags: AUDIT --- title: 2009 Financial Statements and Audit Results --- diff --git a/content/about/reports/2009-irs-form-990/contents.lr b/content/about/reports/2009-irs-form-990/contents.lr index 2fe0959..2a69a16 100644 --- a/content/about/reports/2009-irs-form-990/contents.lr +++ b/content/about/reports/2009-irs-form-990/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2009 --- -tags: Fiscal Year 2009 +tags: IRS 990 --- title: 2009 IRS Form 990 --- diff --git a/content/about/reports/2010-irs-form-990/contents.lr b/content/about/reports/2010-irs-form-990/contents.lr index 55072e0..15cf517 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: Fiscal Year 2010 +tags: AUDIT --- title: 2010 IRS Form 990, State of MA Form PC, and Independent Audit Results --- diff --git a/content/about/reports/2011-data-collection/contents.lr b/content/about/reports/2011-data-collection/contents.lr index 0d0151c..2e2b8f0 100644 --- a/content/about/reports/2011-data-collection/contents.lr +++ b/content/about/reports/2011-data-collection/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2011 --- -tags: Fiscal Year 2011 +tags: FISCAL YEAR --- title: 2011 Dept of Commerce Data Collection Form --- diff --git a/content/about/reports/2011-financial-statements/contents.lr b/content/about/reports/2011-financial-statements/contents.lr index 6bd6b70..f78dca4 100644 --- a/content/about/reports/2011-financial-statements/contents.lr +++ b/content/about/reports/2011-financial-statements/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2011 --- -tags: Fiscal Year 2011 +tags: AUDIT --- title: 2011 Financial Statements and Audit Report --- diff --git a/content/about/reports/2011-form-pc/contents.lr b/content/about/reports/2011-form-pc/contents.lr index 576789b..5fc52cc 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 2011 +tags: FISCAL YEAR --- title: 2011 Steate of MA Form PC --- diff --git a/content/about/reports/2011-irs-form-990/contents.lr b/content/about/reports/2011-irs-form-990/contents.lr index d3b69f2..3ea16d9 100644 --- a/content/about/reports/2011-irs-form-990/contents.lr +++ b/content/about/reports/2011-irs-form-990/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2011 --- -tags: Fiscal Year 2011 +tags: AUDIT --- title: 2011 IRS Form 990 --- diff --git a/content/about/reports/2012-annual-report/contents.lr b/content/about/reports/2012-annual-report/contents.lr index 6b85a3a..8efd62e 100644 --- a/content/about/reports/2012-annual-report/contents.lr +++ b/content/about/reports/2012-annual-report/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2012 --- -tags: Fiscal Year 2012 +tags: FISCAL YEAR --- title: 2012 Annual Report --- diff --git a/content/about/reports/2012-financial-statements/contents.lr b/content/about/reports/2012-financial-statements/contents.lr index b57a068..3f7b3b4 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 2012 +tags: FISCAL YEAR --- title: 2012 Financial Statements --- diff --git a/content/about/reports/2012-form-pc/contents.lr b/content/about/reports/2012-form-pc/contents.lr index 93e15ad..fe2e6cc 100644 --- a/content/about/reports/2012-form-pc/contents.lr +++ b/content/about/reports/2012-form-pc/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2012 --- -tags: Fiscal Year 2012 +tags: AUDIT --- title: 2012 Steate of MA Form PC --- diff --git a/content/about/reports/2012-irs-form-990/contents.lr b/content/about/reports/2012-irs-form-990/contents.lr index 8459a5e..278f416 100644 --- a/content/about/reports/2012-irs-form-990/contents.lr +++ b/content/about/reports/2012-irs-form-990/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2012 --- -tags: Fiscal Year 2012 +tags: IRS 990 --- title: 2012 IRS Form 990 --- diff --git a/content/about/reports/2013-financial-statements/contents.lr b/content/about/reports/2013-financial-statements/contents.lr index 40a758f..ae3e6c6 100644 --- a/content/about/reports/2013-financial-statements/contents.lr +++ b/content/about/reports/2013-financial-statements/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2013 --- -tags: Fiscal Year 2013 +tags: AUDIT --- title: 2013 Financial Statements --- diff --git a/content/about/reports/2013-form-pc/contents.lr b/content/about/reports/2013-form-pc/contents.lr index 4e815ba..4392db7 100644 --- a/content/about/reports/2013-form-pc/contents.lr +++ b/content/about/reports/2013-form-pc/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2013 --- -tags: Fiscal Year 2013 +tags: AUDIT --- title: 2013 Steate of MA Form PC --- diff --git a/content/about/reports/2013-irs-form-990/contents.lr b/content/about/reports/2013-irs-form-990/contents.lr index 0261f2c..12872b3 100644 --- a/content/about/reports/2013-irs-form-990/contents.lr +++ b/content/about/reports/2013-irs-form-990/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2013 --- -tags: Fiscal Year 2013 +tags: IRS 990 --- title: 2013 IRS Form 990 --- diff --git a/content/about/reports/2014-irs-form-990/contents.lr b/content/about/reports/2014-irs-form-990/contents.lr index 1ea5cbe..21f2e97 100644 --- a/content/about/reports/2014-irs-form-990/contents.lr +++ b/content/about/reports/2014-irs-form-990/contents.lr @@ -4,7 +4,9 @@ type: report --- date: 2014 --- -tags: Fiscal Year 2014 +tags: +IRS 990 +AUDIT --- title: 2014 IRS Form 990, State of MA Form PC, and Independent Audit Results --- diff --git a/content/about/reports/2015-irs-form-990/contents.lr b/content/about/reports/2015-irs-form-990/contents.lr index d3886c5..c42cbf2 100644 --- a/content/about/reports/2015-irs-form-990/contents.lr +++ b/content/about/reports/2015-irs-form-990/contents.lr @@ -4,7 +4,9 @@ type: report --- date: 2015 --- -tags: Fiscal Year 2015 +tags: +IRS 990 +AUDIT --- title: 2015 IRS Form 990, State of MA Form PC, and Independent Audit Results --- diff --git a/content/about/reports/2016-12-05-tor-project-bylaws/contents.lr b/content/about/reports/2016-12-05-tor-project-bylaws/contents.lr index 58933f6..7449d96 100644 --- a/content/about/reports/2016-12-05-tor-project-bylaws/contents.lr +++ b/content/about/reports/2016-12-05-tor-project-bylaws/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2016 --- -tags: Fiscal Year 2016 +tags: AUDIT --- title: 2016-12-05 Tor Project Bylaws --- diff --git a/content/about/reports/2016-irs-form-990/contents.lr b/content/about/reports/2016-irs-form-990/contents.lr index 72dd971..7b17ac8 100644 --- a/content/about/reports/2016-irs-form-990/contents.lr +++ b/content/about/reports/2016-irs-form-990/contents.lr @@ -4,7 +4,9 @@ type: report --- date: 2016 --- -tags: Fiscal Year 2016 +tags: +IRS 990 +AUDIT --- title: 2016 IRS Form 990 and Independent Audit Results --- diff --git a/content/about/reports/2017-irs-form-990/contents.lr b/content/about/reports/2017-irs-form-990/contents.lr index cb23f28..e4a1c27 100644 --- a/content/about/reports/2017-irs-form-990/contents.lr +++ b/content/about/reports/2017-irs-form-990/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2017 --- -tags: Fiscal Year 2017 +tags: IRS 990 --- title: 2017 IRS Form 990 --- diff --git a/databags/tags.ini b/databags/tags.ini new file mode 100644 index 0000000..67d7dc7 --- /dev/null +++ b/databags/tags.ini @@ -0,0 +1,11 @@ +[IRS 990] +color = primary +label = IRS 990 + +[AUDIT] +color = success +label = AUDIT + +[FISCAL YEAR] +color = success +label = FISCAL YEAR diff --git a/templates/macros/reports.html b/templates/macros/reports.html index 20887b2..b2d9916 100644 --- a/templates/macros/reports.html +++ b/templates/macros/reports.html @@ -11,8 +11,10 @@ <th scope="row">{{ item.date }}</th> <td> {% for tag in item.tags %} - {{ tag }}</td> + {% set t = bag('tags', tag) %} + {{ tag }} {% endfor %} + </td> <td>{{ item.title }}</td> <td><a href="{{ item.link }}">View PDF</a></td> </tr>

1 0

[tpo/master] Add empty report template
by hiro＠torproject.org 22 Jan '19

22 Jan '19

commit c38c843a06f71de0b455a8caafdb691babf177c9 Author: hiro <hiro(a)torproject.org> Date: Tue Jan 22 16:15:35 2019 +0100 Add empty report template --- templates/report.html | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/report.html b/templates/report.html new file mode 100644 index 0000000..59b6d40 --- /dev/null +++ b/templates/report.html @@ -0,0 +1 @@ +{{ this.title }}

1 0

[tpo/staging] Add empty report template
by hiro＠torproject.org 22 Jan '19

22 Jan '19

1 0

[tpo/staging] Edit sponsors models and add documents
by hiro＠torproject.org 22 Jan '19

22 Jan '19

commit 7d95fddc45595cfadb54fa158ce1c08e5ca2da48 Author: hiro <hiro(a)torproject.org> Date: Tue Jan 22 16:13:32 2019 +0100 Edit sponsors models and add documents --- content/about/reports/2007-irs-form-990/contents.lr | 11 +++++++++++ content/about/reports/2008-financial-statements/contents.lr | 11 +++++++++++ content/about/reports/2008-irs-form-990/contents.lr | 11 +++++++++++ content/about/reports/2009-annual-report/contents.lr | 11 +++++++++++ content/about/reports/2009-data-collection/contents.lr | 11 +++++++++++ content/about/reports/2009-financial-statements/contents.lr | 11 +++++++++++ content/about/reports/2009-irs-form-990/contents.lr | 11 +++++++++++ content/about/reports/2010-irs-form-990/contents.lr | 11 +++++++++++ content/about/reports/2011-data-collection/contents.lr | 11 +++++++++++ content/about/reports/2011-financial-statements/contents.lr | 11 +++++++++++ content/about/reports/2011-form-pc/contents.lr | 11 +++++++++++ content/about/reports/2011-irs-form-990/contents.lr | 11 +++++++++++ content/about/reports/2012-annual-report/contents.lr | 11 +++++++++++ content/about/reports/2012-financial-statements/contents.lr | 11 +++++++++++ content/about/reports/2012-form-pc/contents.lr | 11 +++++++++++ content/about/reports/2012-irs-form-990/contents.lr | 11 +++++++++++ content/about/reports/2013-financial-statements/contents.lr | 11 +++++++++++ content/about/reports/2013-form-pc/contents.lr | 11 +++++++++++ content/about/reports/2013-irs-form-990/contents.lr | 11 +++++++++++ content/about/reports/2014-irs-form-990/contents.lr | 11 +++++++++++ content/about/reports/2015-irs-form-990/contents.lr | 11 +++++++++++ .../about/reports/2016-12-05-tor-project-bylaws/contents.lr | 11 +++++++++++ content/about/reports/2016-irs-form-990/contents.lr | 11 +++++++++++ .../{fiscal-year-2017 => 2017-irs-form-990}/contents.lr | 2 +- .../reports/articles-of-organization-as-filed/contents.lr | 9 +++++++++ content/about/reports/articles-of-organization/contents.lr | 9 +++++++++ content/about/reports/conflict-of-interest/contents.lr | 9 +++++++++ content/about/reports/form-1023-exhibit-A/contents.lr | 9 +++++++++ content/about/reports/form-1023/contents.lr | 9 +++++++++ content/about/reports/irs-determination-letter/contents.lr | 9 +++++++++ models/report.ini | 6 +++--- models/reports.ini | 2 +- templates/macros/reports.html | 5 ++++- 33 files changed, 316 insertions(+), 6 deletions(-) diff --git a/content/about/reports/2007-irs-form-990/contents.lr b/content/about/reports/2007-irs-form-990/contents.lr new file mode 100644 index 0000000..cf8c80c --- /dev/null +++ b/content/about/reports/2007-irs-form-990/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2007 +--- +tags: Fiscal Year 2007 +--- +title: 2007 IRS Form 990 +--- +link: https://www.torproject.org/about/findoc/2007-TorProject-Form990.pdf diff --git a/content/about/reports/2008-financial-statements/contents.lr b/content/about/reports/2008-financial-statements/contents.lr new file mode 100644 index 0000000..f124392 --- /dev/null +++ b/content/about/reports/2008-financial-statements/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2008 +--- +tags: Fiscal Year 2008 +--- +title: 2008 Financial Statements and Audit Results +--- +link: https://www.torproject.org/about/findoc/2008-TorProject-FinancialStatements… diff --git a/content/about/reports/2008-irs-form-990/contents.lr b/content/about/reports/2008-irs-form-990/contents.lr new file mode 100644 index 0000000..0e64a97 --- /dev/null +++ b/content/about/reports/2008-irs-form-990/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2008 +--- +tags: Fiscal Year 2008 +--- +title: 2008 IRS Form 990 +--- +link: https://www.torproject.org/about/findoc/2008-TorProject-Form990.pdf diff --git a/content/about/reports/2009-annual-report/contents.lr b/content/about/reports/2009-annual-report/contents.lr new file mode 100644 index 0000000..5e20c5e --- /dev/null +++ b/content/about/reports/2009-annual-report/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2009 +--- +tags: Fiscal Year 2009 +--- +title: 2009 Annual Report +--- +link: https://www.torproject.org/about/findoc/2009-TorProject-Annual-Report.pdf diff --git a/content/about/reports/2009-data-collection/contents.lr b/content/about/reports/2009-data-collection/contents.lr new file mode 100644 index 0000000..4b25dd5 --- /dev/null +++ b/content/about/reports/2009-data-collection/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2009 +--- +tags: Fiscal Year 2009 +--- +title: 2009 Dept of Commerce Data Collection Form +--- +link: https://www.torproject.org/about/findoc/2009-TorProject-DCF.pdf diff --git a/content/about/reports/2009-financial-statements/contents.lr b/content/about/reports/2009-financial-statements/contents.lr new file mode 100644 index 0000000..f7c4d67 --- /dev/null +++ b/content/about/reports/2009-financial-statements/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2009 +--- +tags: Fiscal Year 2009 +--- +title: 2009 Financial Statements and Audit Results +--- +link: https://www.torproject.org/about/findoc/2009-TorProject-FinancialStatements… diff --git a/content/about/reports/2009-irs-form-990/contents.lr b/content/about/reports/2009-irs-form-990/contents.lr new file mode 100644 index 0000000..2fe0959 --- /dev/null +++ b/content/about/reports/2009-irs-form-990/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2009 +--- +tags: Fiscal Year 2009 +--- +title: 2009 IRS Form 990 +--- +link: https://www.torproject.org/about/findoc/2009-TorProject-Form990.pdf diff --git a/content/about/reports/2010-irs-form-990/contents.lr b/content/about/reports/2010-irs-form-990/contents.lr new file mode 100644 index 0000000..55072e0 --- /dev/null +++ b/content/about/reports/2010-irs-form-990/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2010 +--- +tags: Fiscal Year 2010 +--- +title: 2010 IRS Form 990, State of MA Form PC, and Independent Audit Results +--- +link: https://www.torproject.org/about/findoc/2010-TorProject-combined-Form990_PC… diff --git a/content/about/reports/2011-data-collection/contents.lr b/content/about/reports/2011-data-collection/contents.lr new file mode 100644 index 0000000..0d0151c --- /dev/null +++ b/content/about/reports/2011-data-collection/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2011 +--- +tags: Fiscal Year 2011 +--- +title: 2011 Dept of Commerce Data Collection Form +--- +link: https://www.torproject.org/about/findoc/2011-TorProject-DCF.pdf diff --git a/content/about/reports/2011-financial-statements/contents.lr b/content/about/reports/2011-financial-statements/contents.lr new file mode 100644 index 0000000..6bd6b70 --- /dev/null +++ b/content/about/reports/2011-financial-statements/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2011 +--- +tags: Fiscal Year 2011 +--- +title: 2011 Financial Statements and Audit Report +--- +link: https://www.torproject.org/about/findoc/2011-TorProject-Amended-Final-Repor… diff --git a/content/about/reports/2011-form-pc/contents.lr b/content/about/reports/2011-form-pc/contents.lr new file mode 100644 index 0000000..576789b --- /dev/null +++ b/content/about/reports/2011-form-pc/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2011 +--- +tags: Fiscal Year 2011 +--- +title: 2011 Steate of MA Form PC +--- +link: https://www.torproject.org/about/findoc/2011-TorProject-FormPC.pdf diff --git a/content/about/reports/2011-irs-form-990/contents.lr b/content/about/reports/2011-irs-form-990/contents.lr new file mode 100644 index 0000000..d3b69f2 --- /dev/null +++ b/content/about/reports/2011-irs-form-990/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2011 +--- +tags: Fiscal Year 2011 +--- +title: 2011 IRS Form 990 +--- +link: https://www.torproject.org/about/findoc/2011-TorProject-Form990.pdf diff --git a/content/about/reports/2012-annual-report/contents.lr b/content/about/reports/2012-annual-report/contents.lr new file mode 100644 index 0000000..6b85a3a --- /dev/null +++ b/content/about/reports/2012-annual-report/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2012 +--- +tags: Fiscal Year 2012 +--- +title: 2012 Annual Report +--- +link: https://www.torproject.org/about/findoc/2012-TorProject-Annual-Report.pdf diff --git a/content/about/reports/2012-financial-statements/contents.lr b/content/about/reports/2012-financial-statements/contents.lr new file mode 100644 index 0000000..b57a068 --- /dev/null +++ b/content/about/reports/2012-financial-statements/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2012 +--- +tags: Fiscal Year 2012 +--- +title: 2012 Financial Statements +--- +link: https://www.torproject.org/about/findoc/2012-TorProject-FinancialStatements… diff --git a/content/about/reports/2012-form-pc/contents.lr b/content/about/reports/2012-form-pc/contents.lr new file mode 100644 index 0000000..93e15ad --- /dev/null +++ b/content/about/reports/2012-form-pc/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2012 +--- +tags: Fiscal Year 2012 +--- +title: 2012 Steate of MA Form PC +--- +link: https://www.torproject.org/about/findoc/2012-TorProject-FormPC.pdf diff --git a/content/about/reports/2012-irs-form-990/contents.lr b/content/about/reports/2012-irs-form-990/contents.lr new file mode 100644 index 0000000..8459a5e --- /dev/null +++ b/content/about/reports/2012-irs-form-990/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2012 +--- +tags: Fiscal Year 2012 +--- +title: 2012 IRS Form 990 +--- +link: https://www.torproject.org/about/findoc/2012-TorProject-Form990.pdf diff --git a/content/about/reports/2013-financial-statements/contents.lr b/content/about/reports/2013-financial-statements/contents.lr new file mode 100644 index 0000000..40a758f --- /dev/null +++ b/content/about/reports/2013-financial-statements/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2013 +--- +tags: Fiscal Year 2013 +--- +title: 2013 Financial Statements +--- +link: https://www.torproject.org/about/findoc/2013-TorProject-FinancialStatements… diff --git a/content/about/reports/2013-form-pc/contents.lr b/content/about/reports/2013-form-pc/contents.lr new file mode 100644 index 0000000..4e815ba --- /dev/null +++ b/content/about/reports/2013-form-pc/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2013 +--- +tags: Fiscal Year 2013 +--- +title: 2013 Steate of MA Form PC +--- +link: https://www.torproject.org/about/findoc/2013-TorProject-FormPC.pdf diff --git a/content/about/reports/2013-irs-form-990/contents.lr b/content/about/reports/2013-irs-form-990/contents.lr new file mode 100644 index 0000000..0261f2c --- /dev/null +++ b/content/about/reports/2013-irs-form-990/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2013 +--- +tags: Fiscal Year 2013 +--- +title: 2013 IRS Form 990 +--- +link: https://www.torproject.org/about/findoc/2013-TorProject-Form990.pdf diff --git a/content/about/reports/2014-irs-form-990/contents.lr b/content/about/reports/2014-irs-form-990/contents.lr new file mode 100644 index 0000000..1ea5cbe --- /dev/null +++ b/content/about/reports/2014-irs-form-990/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2014 +--- +tags: Fiscal Year 2014 +--- +title: 2014 IRS Form 990, State of MA Form PC, and Independent Audit Results +--- +link: https://www.torproject.org/about/findoc/2014-TorProject-combined-Form990_PC… diff --git a/content/about/reports/2015-irs-form-990/contents.lr b/content/about/reports/2015-irs-form-990/contents.lr new file mode 100644 index 0000000..d3886c5 --- /dev/null +++ b/content/about/reports/2015-irs-form-990/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2015 +--- +tags: Fiscal Year 2015 +--- +title: 2015 IRS Form 990, State of MA Form PC, and Independent Audit Results +--- +link: https://www.torproject.org/about/findoc/2015-TorProject-combined-Form990_PC… diff --git a/content/about/reports/2016-12-05-tor-project-bylaws/contents.lr b/content/about/reports/2016-12-05-tor-project-bylaws/contents.lr new file mode 100644 index 0000000..58933f6 --- /dev/null +++ b/content/about/reports/2016-12-05-tor-project-bylaws/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2016 +--- +tags: Fiscal Year 2016 +--- +title: 2016-12-05 Tor Project Bylaws +--- +link: https://www.torproject.org/about/findoc/2016-TorProject-Bylaws.pdf diff --git a/content/about/reports/2016-irs-form-990/contents.lr b/content/about/reports/2016-irs-form-990/contents.lr new file mode 100644 index 0000000..72dd971 --- /dev/null +++ b/content/about/reports/2016-irs-form-990/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2016 +--- +tags: Fiscal Year 2016 +--- +title: 2016 IRS Form 990 and Independent Audit Results +--- +link: https://www.torproject.org/about/findoc/2016-TorProject-combined-Form990_Au… diff --git a/content/about/reports/fiscal-year-2017/contents.lr b/content/about/reports/2017-irs-form-990/contents.lr similarity index 87% rename from content/about/reports/fiscal-year-2017/contents.lr rename to content/about/reports/2017-irs-form-990/contents.lr index 2dfa9db..cb23f28 100644 --- a/content/about/reports/fiscal-year-2017/contents.lr +++ b/content/about/reports/2017-irs-form-990/contents.lr @@ -4,7 +4,7 @@ type: report --- date: 2017 --- -tag: Fiscal Year 2017 +tags: Fiscal Year 2017 --- title: 2017 IRS Form 990 --- diff --git a/content/about/reports/articles-of-organization-as-filed/contents.lr b/content/about/reports/articles-of-organization-as-filed/contents.lr new file mode 100644 index 0000000..80df230 --- /dev/null +++ b/content/about/reports/articles-of-organization-as-filed/contents.lr @@ -0,0 +1,9 @@ +_model: report +--- +type: document +--- +title: Tor Articles of Organization as filed +--- +description: Articles of Organization as they were filed by the Commonwealth of Massachusetts, including continuation pages. +--- +link: https://gitweb.torproject.org/company/policies.git/plain/corpdocs/Tor-Artic… diff --git a/content/about/reports/articles-of-organization/contents.lr b/content/about/reports/articles-of-organization/contents.lr new file mode 100644 index 0000000..f3092b6 --- /dev/null +++ b/content/about/reports/articles-of-organization/contents.lr @@ -0,0 +1,9 @@ +_model: report +--- +type: document +--- +title: Tor Articles of Organization +--- +description: Articles of Organization for Tor Project, Inc. +--- +link: https://gitweb.torproject.org/company/policies.git/plain/corpdocs/Tor-Artic… diff --git a/content/about/reports/conflict-of-interest/contents.lr b/content/about/reports/conflict-of-interest/contents.lr new file mode 100644 index 0000000..3041514 --- /dev/null +++ b/content/about/reports/conflict-of-interest/contents.lr @@ -0,0 +1,9 @@ +_model: report +--- +type: document +--- +title: Tor Conflict of Interest Policy +--- +description: Policy protecting the organization's interest from officers and directors entering arrangements that might benefit their private interests. +--- +link: https://gitweb.torproject.org/company/policies.git/plain/corpdocs/Tor-Confl… diff --git a/content/about/reports/form-1023-exhibit-A/contents.lr b/content/about/reports/form-1023-exhibit-A/contents.lr new file mode 100644 index 0000000..1467d54 --- /dev/null +++ b/content/about/reports/form-1023-exhibit-A/contents.lr @@ -0,0 +1,9 @@ +_model: report +--- +type: document +--- +title: Form 1023 Exhibit A +--- +description: Form 1023 Exhibit A. +--- +link: https://gitweb.torproject.org/company/policies.git/plain/corpdocs/Form-1023… diff --git a/content/about/reports/form-1023/contents.lr b/content/about/reports/form-1023/contents.lr new file mode 100644 index 0000000..9c40029 --- /dev/null +++ b/content/about/reports/form-1023/contents.lr @@ -0,0 +1,9 @@ +_model: report +--- +type: document +--- +title: Form 1023 +--- +description: Application for Recognition of Exemption Under Section 501(c)(3) of the Internal Revenue Code. +--- +link: https://gitweb.torproject.org/company/policies.git/plain/corpdocs/Form-1023… diff --git a/content/about/reports/irs-determination-letter/contents.lr b/content/about/reports/irs-determination-letter/contents.lr new file mode 100644 index 0000000..290f639 --- /dev/null +++ b/content/about/reports/irs-determination-letter/contents.lr @@ -0,0 +1,9 @@ +_model: report +--- +type: document +--- +title: IRS Determination Letter +--- +description: IRS decision that Tor Project, Inc. is exempt from Federal income tax under section 501(c)(3) of the Internal Revenue Code. +--- +link: https://gitweb.torproject.org/company/policies.git/plain/corpdocs/IRS-Deter… diff --git a/models/report.ini b/models/report.ini index d629831..4f114b0 100644 --- a/models/report.ini +++ b/models/report.ini @@ -15,9 +15,9 @@ type = string label = Type type = string -[fields.tag] -label = Tag -type = string +[fields.tags] +label = Tags +type = strings [fields.link] label = Link diff --git a/models/reports.ini b/models/reports.ini index eba6b0b..2dcb612 100644 --- a/models/reports.ini +++ b/models/reports.ini @@ -25,4 +25,4 @@ type = string [children] model = report -order_by = name +order_by = -year, -title diff --git a/templates/macros/reports.html b/templates/macros/reports.html index 1b399a9..20887b2 100644 --- a/templates/macros/reports.html +++ b/templates/macros/reports.html @@ -9,7 +9,10 @@ {% macro render_report(item, alternative) %} <tr> <th scope="row">{{ item.date }}</th> - <td>{{ item.tag }}</td> + <td> + {% for tag in item.tags %} + {{ tag }}</td> + {% endfor %} <td>{{ item.title }}</td> <td><a href="{{ item.link }}">View PDF</a></td> </tr>

1 0

[tpo/master] Edit sponsors models and add documents
by hiro＠torproject.org 22 Jan '19

22 Jan '19

1 0

[tor/master] check-changes: Check bugfix version formatting
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 7e862c3ec029d3cdfdd07483e31843c8f3b48a68 Author: teor <teor(a)torproject.org> Date: Sat Sep 15 01:23:02 2018 +1000 check-changes: Check bugfix version formatting Check that bugfix versions in changes files look like Tor versions from the versions spec. Part of ticket 27761. --- changes/ticket27761 | 3 +++ scripts/maint/lintChanges.py | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/changes/ticket27761 b/changes/ticket27761 new file mode 100644 index 000000000..ef4686bdc --- /dev/null +++ b/changes/ticket27761 @@ -0,0 +1,3 @@ + o Minor features (changelogs): + - Check that bugfix versions in changes files look like Tor versions + from the versions spec. Closes ticket 27761. diff --git a/scripts/maint/lintChanges.py b/scripts/maint/lintChanges.py index d5b8fcae5..5c5d45da1 100755 --- a/scripts/maint/lintChanges.py +++ b/scripts/maint/lintChanges.py @@ -87,6 +87,12 @@ def lintfile(fname): warn("Bugfix does not say 'Fixes bug X; bugfix on Y'") elif re.search('tor-([0-9]+)', contents): warn("Do not prefix versions with 'tor-'. ('0.1.2', not 'tor-0.1.2'.)") + else: + bugfix_match = re.search('bugfix on ([0-9]+\.[0-9]+\.[0-9]+)', contents) + if bugfix_match is None: + warn("Versions must have at least 3 digits. ('0.1.2', '0.3.4.8', or '0.3.5.1-alpha'.)") + elif bugfix_match.group(0) is None: + warn("Versions must have at least 3 digits. ('0.1.2', '0.3.4.8', or '0.3.5.1-alpha'.)") return have_warned != []

1 0

[tor/master] lintChanges.py: Two python re usage fixes
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 7e1f89346022a4e90d416dad84ffdda483dbd3b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 17 08:46:06 2019 -0500 lintChanges.py: Two python re usage fixes --- scripts/maint/lintChanges.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/maint/lintChanges.py b/scripts/maint/lintChanges.py index 39fa08bb4..82c118f07 100755 --- a/scripts/maint/lintChanges.py +++ b/scripts/maint/lintChanges.py @@ -43,7 +43,7 @@ def split_tor_version(version): If the version is malformed, returns None. ''' - version_match = re.search('([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?', version) + version_match = re.match('([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?', version) if version_match is None: return None @@ -125,7 +125,7 @@ def lintfile(fname): warn("Versions must have at least 3 digits. ('0.1.2', '0.3.4.8', or '0.3.5.1-alpha'.)") else: bugfix_match = re.search('bugfix on ([0-9a-z][-.0-9a-z]+[0-9a-z])', contents) - bugfix_group = bugfix_match.groups(0) if bugfix_match is not None else None + bugfix_group = bugfix_match.groups() if bugfix_match is not None else None bugfix_version = bugfix_group[0] if bugfix_group is not None else None package_version = os.environ.get('PACKAGE_VERSION', None) if bugfix_version is None:

1 0

[tor/master] check-changes: Warn about bugfixes on future releases
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 3eafa61f6324c91b4bb8c02a6e54db0f12ef42c2 Author: teor <teor(a)torproject.org> Date: Tue Sep 18 20:39:03 2018 +1000 check-changes: Warn about bugfixes on future releases Warn when bugfix changes files say that the bug is in a future release. Closes ticket 27761. --- Makefile.am | 2 +- changes/ticket27761 | 3 ++- scripts/maint/lintChanges.py | 50 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 36a5dd2e9..9a65e083a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -408,7 +408,7 @@ endif check-changes: if USEPYTHON @if test -d "$(top_srcdir)/changes"; then \ - $(PYTHON) $(top_srcdir)/scripts/maint/lintChanges.py $(top_srcdir)/changes; \ + PACKAGE_VERSION=$(PACKAGE_VERSION) $(PYTHON) $(top_srcdir)/scripts/maint/lintChanges.py $(top_srcdir)/changes; \ fi endif diff --git a/changes/ticket27761 b/changes/ticket27761 index ef4686bdc..35106ee9c 100644 --- a/changes/ticket27761 +++ b/changes/ticket27761 @@ -1,3 +1,4 @@ o Minor features (changelogs): - Check that bugfix versions in changes files look like Tor versions - from the versions spec. Closes ticket 27761. + from the versions spec. Warn when bugfixes claim to be on a future + release. Closes ticket 27761. diff --git a/scripts/maint/lintChanges.py b/scripts/maint/lintChanges.py index 5c5d45da1..39fa08bb4 100755 --- a/scripts/maint/lintChanges.py +++ b/scripts/maint/lintChanges.py @@ -35,6 +35,36 @@ NEEDS_SUBCATEGORIES = set([ "Major features", ]) +def split_tor_version(version): + ''' + Return the initial numeric components of the Tor version as a list of ints. + For versions earlier than 0.1.0, returns MAJOR, MINOR, and MICRO. + For versions 0.1.0 and later, returns MAJOR, MINOR, MICRO, and PATCHLEVEL if present. + + If the version is malformed, returns None. + ''' + version_match = re.search('([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?', version) + if version_match is None: + return None + + version_groups = version_match.groups() + if version_groups is None: + return None + if len(version_groups) < 3: + return None + + if len(version_groups) != 5: + return None + version_components = version_groups[0:3] + version_components += version_groups[4:5] + + try: + version_list = [int(v) for v in version_components if v is not None] + except ValueError: + return None + + return version_list + def lintfile(fname): have_warned = [] @@ -93,6 +123,26 @@ def lintfile(fname): warn("Versions must have at least 3 digits. ('0.1.2', '0.3.4.8', or '0.3.5.1-alpha'.)") elif bugfix_match.group(0) is None: warn("Versions must have at least 3 digits. ('0.1.2', '0.3.4.8', or '0.3.5.1-alpha'.)") + else: + bugfix_match = re.search('bugfix on ([0-9a-z][-.0-9a-z]+[0-9a-z])', contents) + bugfix_group = bugfix_match.groups(0) if bugfix_match is not None else None + bugfix_version = bugfix_group[0] if bugfix_group is not None else None + package_version = os.environ.get('PACKAGE_VERSION', None) + if bugfix_version is None: + # This should be unreachable, unless the patterns are out of sync + warn("Malformed bugfix version.") + elif package_version is not None: + # If $PACKAGE_VERSION isn't set, skip this check + bugfix_split = split_tor_version(bugfix_version) + package_split = split_tor_version(package_version) + if bugfix_split is None: + # This should be unreachable, unless the patterns are out of sync + warn("Malformed bugfix version: '{}'.".format(bugfix_version)) + elif package_split is None: + # This should be unreachable, unless the patterns are out of sync, or the package versioning scheme has changed + warn("Malformed $PACKAGE_VERSION: '{}'.".format(package_version)) + elif bugfix_split > package_split: + warn("Bugfixes must be made on earlier versions (or this version). (Bugfix on version: '{}', current tor package version: '{}'.)".format(bugfix_version, package_version)) return have_warned != []

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/653'
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 00bc18b84799afcb6a48e0ee9273e155e3d2a54e Merge: 0ce4d23af 7e1f89346 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 22 08:13:14 2019 -0500 Merge remote-tracking branch 'tor-github/pr/653' Makefile.am | 2 +- changes/ticket27761 | 4 ++++ scripts/maint/lintChanges.py | 56 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.5] Merge branch 'bug28979_035' into maint-0.3.5
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 9ce1978b5ea630bca699eb1cf7f3f1c178f8e939 Merge: a8580a683 7c6a8c674 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 22 08:04:52 2019 -0500 Merge branch 'bug28979_035' into maint-0.3.5 changes/bug28979 | 4 ++++ doc/tor.1.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2019