From 63831b4e78ba4964fa7c7556ffb041f9624258c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 06:20:18 +0000 Subject: [PATCH 1/8] Bump nokogiri from 1.10.10 to 1.15.5 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.10 to 1.15.5. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.10...v1.15.5) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 73f1a50d8d..34f2cfb0fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,19 +79,21 @@ GEM rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) mini_magick (4.9.4) - mini_portile2 (2.4.0) + mini_portile2 (2.8.5) minitest (5.14.2) neat (3.0.0) sass (~> 3.4) thor (~> 0.19) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.15.5) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) parallel (1.19.2) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (5.0.4) + racc (1.7.3) rack (2.2.8) rainbow (3.0.0) rake (12.3.3) From 10dc94e9a68707ee77589ee9c97d9a8412c6928c Mon Sep 17 00:00:00 2001 From: ckb Date: Mon, 18 Dec 2023 16:11:32 -0800 Subject: [PATCH 2/8] rm broken links from press page --- press.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/press.md b/press.md index 21819b2c09..1eebb207c2 100644 --- a/press.md +++ b/press.md @@ -4,12 +4,9 @@ title: Press ## 2018 -[Follow the money: Updated website makes Oakland election data accessible](https://oaklandnorth.net/2018/10/10/follow-the-money-updated-website-makes-oakland-election-data-accessible/) +[Follow the money: Updated website makes Oakland election data accessible](https://oaklandnorth.net/2018/10/10/follow-the-money-updated-website-makes-oakland-election-data-accessible/) *October 10, 2018 – Oakland North, Maria Sestito* -[Oakland Elections Fundraising News Thanks To Open Disclosure Oakland](http://oaklandnewsnow.com/index.php/2018/10/05/oakland-elections-fundraising-news-thanks-to-open-disclosure-oakland/) -*October 5, 2018 – Oakland News Now, Zennie Abraham* - [Oakland Public Ethics Commission and Local Volunteers Launch Campaign Finance App for November Election](https://www.oaklandca.gov/news/2018/oakland-public-ethics-commission-and-local-volunteers-launch-campaign-finance-app-for-november-election) *September 18, 2018 – City of Oakland* @@ -19,17 +16,14 @@ title: Press [Oakland’s Code for America summit emphasizes diversity and inclusiveness](https://www.eastbaytimes.com/2016/11/16/oaklands-code-for-america-summit-emphasizes-diversity-and-inclusiveness/) *November 16, 2016 – East Bay Times, Howard Dyckoff* -[OpenOakland and The Search for Sustainable Civic Technology](https://civichall.org/civicist/open-oakland-and-the-search-sustainable-civic-tech/) -*May 9, 2016 – Civicist/Civic Hall, Jessica McKenzie* - [Local Volunteers Build OpenDisclosure.io Website to Show Political Campaign Contributions](https://www.oaklandca.gov/news/2016/local-volunteers-build-opendisclosure-io-website-to-show-political-campaign-contributions) *October 18, 2016 – City of Oakland* ## 2014 -[Oakland App Sheds Light on Campaign Finance](http://www.govtech.com/data/Oakland-App-Sheds-Light-on-Campaign-Finance.html?utm_source=newsletter_editorial&utm_medium=saturday_edition&utm_campaign=GovTech_Today&elq=23c8f56ed8714e8cb6aa1fb314580d3f&elqCampaignId=10033) +[Oakland App Sheds Light on Campaign Finance](https://www.govtech.com/data/Oakland-App-Sheds-Light-on-Campaign-Finance.html?utm_source=newsletter_editorial&utm_medium=saturday_edition&utm_campaign=GovTech_Today&elq=23c8f56ed8714e8cb6aa1fb314580d3f&elqCampaignId=10033) *August 28, 2014 – Gov Tech, Jason Shueh* -[Volunteers hack technology to improve Oakland city government](http://www.kalw.org/post/volunteers-hack-technology-improve-oakland-city-government#stream/0) +[Volunteers hack technology to improve Oakland city government](https://www.kalw.org/post/volunteers-hack-technology-improve-oakland-city-government#stream/0) *March 18, 2014 – KALW Radio, Laura Flynn* From 5b0fc00748970bf94d3dd3c3c5a06929a07cf22c Mon Sep 17 00:00:00 2001 From: ckb Date: Mon, 18 Dec 2023 16:28:52 -0800 Subject: [PATCH 3/8] make all links https in faq.md, and fix OakData link --- faq.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/faq.md b/faq.md index 30b5249655..c6adec4799 100644 --- a/faq.md +++ b/faq.md @@ -23,21 +23,21 @@ title: Frequently asked questions Open Disclosure visualizes campaign finance data for Oakland candidates and ballot measures. The data comes from the City’s [campaign finance portal](https://public.netfile.com/pub2/Default.aspx?aid=COAK) on the City of Oakland Public Ethics Commission website. -The data collected by the Public Ethics Commission is required by the California [Political Reform Act (PRA)](http://www.fppc.ca.gov/the-law/the-political-reform-act.html), which requires that a candidate or campaign committee that plans to raise or spend $2,000 or more in a calendar year—including the candidate’s personal funds—must file statements and reports on the committee’s financial activity at specified periods. Candidates or campaign committees that do not raise or spend $2,000 or more in a calendar year are not required to report their financial activity electronically, which may result in some candidates with no available public financial data. +The data collected by the Public Ethics Commission is required by the California [Political Reform Act (PRA)](https://www.fppc.ca.gov/the-law/the-political-reform-act.html), which requires that a candidate or campaign committee that plans to raise or spend $2,000 or more in a calendar year—including the candidate’s personal funds—must file statements and reports on the committee’s financial activity at specified periods. Candidates or campaign committees that do not raise or spend $2,000 or more in a calendar year are not required to report their financial activity electronically, which may result in some candidates with no available public financial data. Campaign finance data is self-reported by all local candidate-controlled and ballot measure committees. Our volunteer team does not clean, scrub, or edit the data. If there are misspellings or duplicate entries, then that was how the committee reported the campaign finance data. The data is presented as reported. Where necessary we may aggregate data that we believe represents the same entity. ## Where does the data come from? -The campaign finance data that Open Disclosure presents is derived primarily from the filings of the California Fair Political Practices Commission (FPPC) [Form 460](http://www.fppc.ca.gov/content/dam/fppc/NS-Documents/TAD/Campaign%20Forms/460.pdf) (Recipient Committee Campaign Statement). Once a campaign committee has raised or spent $2,000 or more it must file Form 460, which contains an overview of the committee’s activity during a specified period. +The campaign finance data that Open Disclosure presents is derived primarily from the filings of the California Fair Political Practices Commission (FPPC) [Form 460](https://www.fppc.ca.gov/content/dam/fppc/NS-Documents/TAD/Campaign%20Forms/460.pdf) (Recipient Committee Campaign Statement). Once a campaign committee has raised or spent $2,000 or more it must file Form 460, which contains an overview of the committee’s activity during a specified period. -Oakland campaign committees file Form 460 with the Public Ethics Commission’s e-filing system, NetFile, which is available on the [Public Portal for Campaign Finance and Lobbyist Disclosure](http://nf4.netfile.com/pub2/Default.aspx?aid=COAK&AspxAutoDetectCookieSupport=1). The raw data is also synced daily to the City of Oakland's [OakData portal](https://data.oaklandnet.com/). +Oakland campaign committees file Form 460 with the Public Ethics Commission’s e-filing system, NetFile, which is available on the [Public Portal for Campaign Finance and Lobbyist Disclosure](https://nf4.netfile.com/pub2/Default.aspx?aid=COAK&AspxAutoDetectCookieSupport=1). The raw data is also synced daily to the City of Oakland's [OakData portal](https://data.oaklandca.gov/). ## How up-to-date is the data? The data is published to the site approximately every 24 hours. The data for -Open Disclosure is based on campaign finance [filing deadlines](http://www.fppc.ca.gov/learn/campaign-rules/where-and-when-to-file-campaign-statements/when-to-file-campaign-statements-state-local-filing-schedules.html) established by the +Open Disclosure is based on campaign finance [filing deadlines](https://www.fppc.ca.gov/learn/campaign-rules/where-and-when-to-file-campaign-statements/when-to-file-campaign-statements-state-local-filing-schedules.html) established by the State of California Fair Political Practices Commission (FPPC) for all state and local elections. @@ -79,7 +79,7 @@ The total contributions and the itemized lists are calculated using different da ## What is an Independent Expenditure? -Political spending that expressly advocates the election or defeat of a candidate or ballot measure but is not made in consultation, cooperation, or coordination with the candidate or campaign committee is termed an [independent expenditure](http://www.fppc.ca.gov/content/dam/fppc/NS-Documents/TAD/Campaign%20Manuals/Manual_4/Manual_4_Ch_11_IE_Reporting.pdf). Under California law, any entity that makes independent expenditures of $1,000 or more per year to California candidates or ballot measures is subject to California campaign finance disclosure reporting requirements. +Political spending that expressly advocates the election or defeat of a candidate or ballot measure but is not made in consultation, cooperation, or coordination with the candidate or campaign committee is termed an [independent expenditure](https://www.fppc.ca.gov/content/dam/fppc/NS-Documents/TAD/Campaign%20Manuals/Manual_4/Manual_4_Ch_11_IE_Reporting.pdf). Under California law, any entity that makes independent expenditures of $1,000 or more per year to California candidates or ballot measures is subject to California campaign finance disclosure reporting requirements. ## How are contributions calculated for committees that support or oppose multiple measures? @@ -87,7 +87,7 @@ Data reported by committees formed to support or oppose multiple ballot measures ## What other types of committees must report their campaign-related spending? -Committees that are not candidate-controlled or formed to support or oppose a particular candidate or ballot measure also raise funds and spend money in local elections. Under the Political Reform Act, committees that receive contributions or make expenditures to support or oppose multiple candidates and/or ballot measures must also file statements and reports on their activities just as candidate and ballot measure committees do. They must also report which candidate or ballot measure their expenditure is intended to support or oppose and whether the expenditure is a contribution to the campaign or an independent expenditure (see above). Independent expenditures are not included in the fundraising totals for candidates or ballot measures, but they are shown in a separate line item. For more information, see the [California Fair Political Practices Commission guide to Campaign Rules](http://www.fppc.ca.gov/learn/campaign-rules.html). +Committees that are not candidate-controlled or formed to support or oppose a particular candidate or ballot measure also raise funds and spend money in local elections. Under the Political Reform Act, committees that receive contributions or make expenditures to support or oppose multiple candidates and/or ballot measures must also file statements and reports on their activities just as candidate and ballot measure committees do. They must also report which candidate or ballot measure their expenditure is intended to support or oppose and whether the expenditure is a contribution to the campaign or an independent expenditure (see above). Independent expenditures are not included in the fundraising totals for candidates or ballot measures, but they are shown in a separate line item. For more information, see the [California Fair Political Practices Commission guide to Campaign Rules](https://www.fppc.ca.gov/learn/campaign-rules.html). ## How were ballot measure summaries prepared? @@ -120,7 +120,7 @@ Contact the [Public Ethics Commission](https://www.oaklandca.gov/boards-and-comm ## Expenditure Categories: What each category includes _From [Form 460 Schedule -E](http://www.fppc.ca.gov/content/dam/fppc/NS-Documents/TAD/Campaign%20Forms/460.pdf), +E](https://www.fppc.ca.gov/content/dam/fppc/NS-Documents/TAD/Campaign%20Forms/460.pdf), p24_ From 6ecf420dfeaf65a2537dd224de56d6a562dca783 Mon Sep 17 00:00:00 2001 From: ckb Date: Mon, 18 Dec 2023 16:29:18 -0800 Subject: [PATCH 4/8] make netfile portal link https in footer --- _includes/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/footer.html b/_includes/footer.html index 5ddd9a2366..c025368f2a 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -19,7 +19,7 @@
Brought to you by and Oakland’s Public Ethics Commission
-
Campaign finance data provided by the City of Oakland Public Ethics Commission Public Portal for Campaign Finance and Lobbyist Disclosure. Candidate and ballot measure information gathered from information provided to the Alameda County Registrar of Voters by the City of Oakland.
+
Campaign finance data provided by the City of Oakland Public Ethics Commission Public Portal for Campaign Finance and Lobbyist Disclosure. Candidate and ballot measure information gathered from information provided to the Alameda County Registrar of Voters by the City of Oakland.
From db4075e049a76e0c3a9d9b4808b4eb5fd4d5f196 Mon Sep 17 00:00:00 2001 From: ckb Date: Mon, 18 Dec 2023 16:48:50 -0800 Subject: [PATCH 5/8] make xmlns link in svg https --- assets/fontawesome/desktop-solid.svg | 2 +- assets/fontawesome/external-link-square-alt-solid.svg | 2 +- assets/fontawesome/icon-facebook-square.svg | 2 +- assets/fontawesome/icon-instagram.svg | 2 +- assets/fontawesome/map-marked-alt-solid.svg | 2 +- assets/fontawesome/table-solid.svg | 2 +- assets/fontawesome/twitter-brands.svg | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/fontawesome/desktop-solid.svg b/assets/fontawesome/desktop-solid.svg index a6082657d9..0bf05a7ed9 100644 --- a/assets/fontawesome/desktop-solid.svg +++ b/assets/fontawesome/desktop-solid.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/fontawesome/external-link-square-alt-solid.svg b/assets/fontawesome/external-link-square-alt-solid.svg index e84b288df0..7ad1ac9818 100644 --- a/assets/fontawesome/external-link-square-alt-solid.svg +++ b/assets/fontawesome/external-link-square-alt-solid.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/fontawesome/icon-facebook-square.svg b/assets/fontawesome/icon-facebook-square.svg index b86c5a7817..397fc1dce0 100644 --- a/assets/fontawesome/icon-facebook-square.svg +++ b/assets/fontawesome/icon-facebook-square.svg @@ -1,5 +1,5 @@ - + icon-facebook-square diff --git a/assets/fontawesome/icon-instagram.svg b/assets/fontawesome/icon-instagram.svg index 745f00ba27..71378220a2 100644 --- a/assets/fontawesome/icon-instagram.svg +++ b/assets/fontawesome/icon-instagram.svg @@ -1,5 +1,5 @@ - + icon-instagram diff --git a/assets/fontawesome/map-marked-alt-solid.svg b/assets/fontawesome/map-marked-alt-solid.svg index f4b72dd2b2..3f2e8d8ffa 100644 --- a/assets/fontawesome/map-marked-alt-solid.svg +++ b/assets/fontawesome/map-marked-alt-solid.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/fontawesome/table-solid.svg b/assets/fontawesome/table-solid.svg index 2750cff1f9..6ddd993226 100644 --- a/assets/fontawesome/table-solid.svg +++ b/assets/fontawesome/table-solid.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/fontawesome/twitter-brands.svg b/assets/fontawesome/twitter-brands.svg index 30c7c9f377..f8e2a7720e 100644 --- a/assets/fontawesome/twitter-brands.svg +++ b/assets/fontawesome/twitter-brands.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 1b2ced30e7a448d725b579601c86a9122c65c156 Mon Sep 17 00:00:00 2001 From: ckb Date: Mon, 18 Dec 2023 16:51:01 -0800 Subject: [PATCH 6/8] replace http with https in candidate --- _layouts/candidate.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/candidate.html b/_layouts/candidate.html index a464fdbf79..e17e544199 100644 --- a/_layouts/candidate.html +++ b/_layouts/candidate.html @@ -60,7 +60,7 @@

{{ candidate.name | smartify }}

{% endif %} {% if candidate.website_url %} -
{% include svg-icon.html +
{% include svg-icon.html icon="desktop-solid" %} {{ candidate.website_url }}
{% endif %} {% if candidate.twitter_url %} @@ -76,7 +76,7 @@

{{ candidate.name | smartify }}

svg-icon.html icon="icon-instagram" %} {{ candidate.instagram_url }}
{% endif %} {% if candidate.votersedge_url %} -
{% include +
{% include svg-icon.html icon="external-link-square-alt-solid" %} Voter’s Edge profile
{% endif %}
From de3d847f8708ced1f795fa45ccc297f9d0b312cb Mon Sep 17 00:00:00 2001 From: ckb Date: Mon, 18 Dec 2023 16:51:45 -0800 Subject: [PATCH 7/8] upgrade html-proofer --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 34f2cfb0fb..573b28b2b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,23 +13,24 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - ethon (0.12.0) - ffi (>= 1.3.0) + ethon (0.16.0) + ffi (>= 1.15.0) eventmachine (1.2.7) execjs (2.7.0) extras (0.3.0) forwardable-extended (~> 2.5) fastimage (2.1.3) - ffi (1.13.1) + ffi (1.16.3) forwardable-extended (2.6.0) - html-proofer (3.16.0) + html-proofer (4.4.3) addressable (~> 2.3) mercenary (~> 0.3) - nokogumbo (~> 2.0) - parallel (~> 1.3) + nokogiri (~> 1.13) + parallel (~> 1.10) rainbow (~> 3.0) typhoeus (~> 1.3) yell (~> 2.0) + zeitwerk (~> 2.5) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -87,15 +88,13 @@ GEM nokogiri (1.15.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogumbo (2.0.2) - nokogiri (~> 1.8, >= 1.8.4) - parallel (1.19.2) + parallel (1.24.0) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (5.0.4) racc (1.7.3) rack (2.2.8) - rainbow (3.0.0) + rainbow (3.1.1) rake (12.3.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) @@ -115,11 +114,12 @@ GEM rack (> 1, < 3) thor (0.20.0) thread_safe (0.3.6) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (1.2.7) thread_safe (~> 0.1) yell (2.2.2) + zeitwerk (2.6.12) PLATFORMS ruby From e86cedd633996e928d9b1bbd8be49cbfb5979cc3 Mon Sep 17 00:00:00 2001 From: ckb Date: Mon, 18 Dec 2023 16:51:59 -0800 Subject: [PATCH 8/8] fix htmlproofer options for new version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0c41d9ac8f..5bf3c3273a 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ _includes/svg/%.svg: assets/fontawesome/%.svg test: npm test - bundle exec htmlproofer _site --check-html --disable-external + bundle exec htmlproofer _site --disable-external=true bundle exec scss-lint _sass docker: