Chelsyx has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/360588 )
Change subject: Add licensing info ...................................................................... Add licensing info Bug: T167930 Change-Id: I5a42359c682de98dfa8d26231bd4d7cd43a25d9c --- M .gitreview A LICENSE.md M README.md M tab_documentation/action_breakdown.md M tab_documentation/applinks.md M tab_documentation/browsers.md M tab_documentation/clickthrough_rate.md M tab_documentation/dwelltime.md M tab_documentation/first_visit.md M tab_documentation/first_visit_geo.md M tab_documentation/geography.md M tab_documentation/languages_summary.md M tab_documentation/languages_visited.md M tab_documentation/last_action_geo.md M tab_documentation/most_common.md M tab_documentation/most_common_geo.md M tab_documentation/pageviews.md M tab_documentation/referers_byengine.md M tab_documentation/referers_summary.md M tab_documentation/sisproj.md M tab_documentation/traffic_ctr_geo.md M ui.R M utils.R 23 files changed, 140 insertions(+), 121 deletions(-) Approvals: Chelsyx: Verified; Looks good to me, approved diff --git a/.gitreview b/.gitreview index dfa799f..02def08 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=gerrit.wikimedia.org port=29418 project=wikimedia/discovery/prince.git -defaultbranch=master +defaultbranch=develop diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..7355a50 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Wikimedia Foundation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index 5fd2f2b..a93e802 100644 --- a/README.md +++ b/README.md @@ -17,4 +17,4 @@ shiny::runApp(launch.browser = 0) ``` -Please note that this project is released with a [Contributor Code of Conduct](CONDUCT.md). By participating in this project you agree to abide by its terms. +Please note that this project is licensed under [MIT License](LICENSE.md) and released with a [Contributor Code of Conduct](CONDUCT.md). By participating in this project you agree to abide by its terms. [Wikimedia technical spaces code of conduct](https://www.mediawiki.org/wiki/Special:MyLanguage/Code_of_Conduct) also applies. diff --git a/tab_documentation/action_breakdown.md b/tab_documentation/action_breakdown.md index 6ec8197..77cc787 100644 --- a/tab_documentation/action_breakdown.md +++ b/tab_documentation/action_breakdown.md @@ -26,12 +26,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#action_breakdown";> - http://discovery.wmflabs.org/portal/#action_breakdown - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#action_breakdown";>https://discovery.wmflabs.org/portal/#action_breakdown</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/applinks.md b/tab_documentation/applinks.md index f22fd49..1c4d161 100644 --- a/tab_documentation/applinks.md +++ b/tab_documentation/applinks.md @@ -12,12 +12,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#clickthrough_rate";> - http://discovery.wmflabs.org/portal/#clickthrough_rate - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#app_links";>https://discovery.wmflabs.org/portal/#app_links</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/browsers.md b/tab_documentation/browsers.md index 64404d0..5522ea7 100644 --- a/tab_documentation/browsers.md +++ b/tab_documentation/browsers.md @@ -20,12 +20,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#browser_breakdown";> - http://discovery.wmflabs.org/portal/#browser_breakdown - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#browser_breakdown";>https://discovery.wmflabs.org/portal/#browser_breakdown</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/clickthrough_rate.md b/tab_documentation/clickthrough_rate.md index 0ec1a3c..e12c3b5 100644 --- a/tab_documentation/clickthrough_rate.md +++ b/tab_documentation/clickthrough_rate.md @@ -21,12 +21,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#clickthrough_rate";> - http://discovery.wmflabs.org/portal/#clickthrough_rate - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#clickthrough_rate";>https://discovery.wmflabs.org/portal/#clickthrough_rate</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/dwelltime.md b/tab_documentation/dwelltime.md index 6133f1f..bbd23be 100644 --- a/tab_documentation/dwelltime.md +++ b/tab_documentation/dwelltime.md @@ -14,12 +14,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#dwell_data";> - http://discovery.wmflabs.org/portal/#dwell_data - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#dwell_data";>https://discovery.wmflabs.org/portal/#dwell_data</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/first_visit.md b/tab_documentation/first_visit.md index 9617b62..17fc754 100644 --- a/tab_documentation/first_visit.md +++ b/tab_documentation/first_visit.md @@ -23,12 +23,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#first_visit";> - http://discovery.wmflabs.org/portal/#first_visit - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#first_visit";>https://discovery.wmflabs.org/portal/#first_visit</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/first_visit_geo.md b/tab_documentation/first_visit_geo.md index 9ea61b2..a462c69 100644 --- a/tab_documentation/first_visit_geo.md +++ b/tab_documentation/first_visit_geo.md @@ -42,12 +42,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#first_visits_by_country";> - http://discovery.wmflabs.org/portal/#first_visits_by_country - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#first_visits_by_country";>https://discovery.wmflabs.org/portal/#first_visits_by_country</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/geography.md b/tab_documentation/geography.md index 3e14093..4f2c1e5 100644 --- a/tab_documentation/geography.md +++ b/tab_documentation/geography.md @@ -34,12 +34,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#country_breakdown";> - http://discovery.wmflabs.org/portal/#country_breakdown - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#country_breakdown";>https://discovery.wmflabs.org/portal/#country_breakdown</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/languages_summary.md b/tab_documentation/languages_summary.md index 6c10a08..5e31718 100644 --- a/tab_documentation/languages_summary.md +++ b/tab_documentation/languages_summary.md @@ -22,13 +22,12 @@ ## Questions, bug reports, and feature suggestions -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - An experimental dashboard for looking at patterns of <a href= "https://www.mediawiki.org/wiki/Wikipedia.org_Portal";>Wikipedia.org Portal</a> usage pertaining to users' languages. See <a href="https://phabricator.wikimedia.org/T140816";>T140816</a> for more information. - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#languages_summary";> - http://discovery.wmflabs.org/portal/#languages_summary - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#languages_summary";>https://discovery.wmflabs.org/portal/#languages_summary</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/languages_visited.md b/tab_documentation/languages_visited.md index 6f167a4..5247e24 100644 --- a/tab_documentation/languages_visited.md +++ b/tab_documentation/languages_visited.md @@ -26,12 +26,12 @@ ## Questions, bug reports, and feature suggestions -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#languages_visited";> - http://discovery.wmflabs.org/portal/#languages_visited - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#languages_visited";>https://discovery.wmflabs.org/portal/#languages_visited</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/last_action_geo.md b/tab_documentation/last_action_geo.md index e9697c0..45a1619 100644 --- a/tab_documentation/last_action_geo.md +++ b/tab_documentation/last_action_geo.md @@ -42,12 +42,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#last_action_by_country";> - http://discovery.wmflabs.org/portal/#last_action_by_country - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#last_action_by_country";>https://discovery.wmflabs.org/portal/#last_action_by_country</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/most_common.md b/tab_documentation/most_common.md index a8e43ec..78730a6 100644 --- a/tab_documentation/most_common.md +++ b/tab_documentation/most_common.md @@ -20,12 +20,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#most_common";> - http://discovery.wmflabs.org/portal/#most_common - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#most_common";>https://discovery.wmflabs.org/portal/#most_common</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/most_common_geo.md b/tab_documentation/most_common_geo.md index 8a7c4be..4227bc5 100644 --- a/tab_documentation/most_common_geo.md +++ b/tab_documentation/most_common_geo.md @@ -42,12 +42,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#most_common_by_country";> - http://discovery.wmflabs.org/portal/#most_common_by_country - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#most_common_by_country";>https://discovery.wmflabs.org/portal/#most_common_by_country</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/pageviews.md b/tab_documentation/pageviews.md index a174ef9..e919a2c 100644 --- a/tab_documentation/pageviews.md +++ b/tab_documentation/pageviews.md @@ -13,12 +13,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#pageview_tab";> - http://discovery.wmflabs.org/portal/#pageview_tab - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#pageviews";>https://discovery.wmflabs.org/portal/#pageviews</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/referers_byengine.md b/tab_documentation/referers_byengine.md index f03fb72..f73f8a6 100644 --- a/tab_documentation/referers_byengine.md +++ b/tab_documentation/referers_byengine.md @@ -14,12 +14,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#search_engines";> - http://discovery.wmflabs.org/portal/#search_engines - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#search_engines";>https://discovery.wmflabs.org/portal/#search_engines</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/referers_summary.md b/tab_documentation/referers_summary.md index fbfb990..fbd3c81 100644 --- a/tab_documentation/referers_summary.md +++ b/tab_documentation/referers_summary.md @@ -16,12 +16,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#referrals_summary";> - http://discovery.wmflabs.org/portal/#referrals_summary - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#referrals_summary";>https://discovery.wmflabs.org/portal/#referrals_summary</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/sisproj.md b/tab_documentation/sisproj.md index 44196ac..fac1a08 100644 --- a/tab_documentation/sisproj.md +++ b/tab_documentation/sisproj.md @@ -12,12 +12,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#clickthrough_rate";> - http://discovery.wmflabs.org/portal/#clickthrough_rate - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#sister_projects";>https://discovery.wmflabs.org/portal/#sister_projects</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> diff --git a/tab_documentation/traffic_ctr_geo.md b/tab_documentation/traffic_ctr_geo.md index fc4232d..d11cc44 100644 --- a/tab_documentation/traffic_ctr_geo.md +++ b/tab_documentation/traffic_ctr_geo.md @@ -34,13 +34,12 @@ Questions, bug reports, and feature suggestions ------ -For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). +For technical, non-bug questions, [email Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question) or [Chelsy](mailto:c...@wikimedia.org?subject=Dashboard%20Question). If you experience a bug or notice something wrong or have a suggestion, [open a ticket in Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery) in the Discovery board or [email Deb](mailto:d...@wikimedia.org?subject=Dashboard%20Question). <hr style="border-color: gray;"> -<p style="font-size: small; color: gray;"> - <strong>Link to this dashboard:</strong> - <a href="http://discovery.wmflabs.org/portal/#all_country";> - http://discovery.wmflabs.org/portal/#all_country - </a> +<p style="font-size: small;"> + <strong>Link to this dashboard:</strong> <a href="https://discovery.wmflabs.org/portal/#all_country";>https://discovery.wmflabs.org/portal/#all_country</a> + | Page is available under <a href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-ShareAlike License">CC-BY-SA 3.0</a> + | <a href="https://phabricator.wikimedia.org/diffusion/WDPR/"; title="Wikipedia.org Portal Dashboard source code repository">Code</a> is licensed under <a href="https://phabricator.wikimedia.org/diffusion/WDPR/browse/master/LICENSE.md"; title="MIT License">MIT</a> + | Part of <a href="https://discovery.wmflabs.org/";>Discovery Dashboards</a> </p> - diff --git a/ui.R b/ui.R index c9d1ea6..735a731 100644 --- a/ui.R +++ b/ui.R @@ -27,7 +27,7 @@ menuItem("Traffic", menuSubItem(text = "Geographic breakdown", tabName = "country_breakdown"), menuSubItem(text = "Browser breakdown", tabName = "browser_breakdown"), - menuSubItem(text = "Pageviews", tabName = "pageview_tab"), + menuSubItem(text = "Pageviews", tabName = "pageviews"), icon = icon("line-chart")), menuItem("Languages", menuSubItem(text = "Summary", tabName = "languages_summary"), @@ -160,7 +160,7 @@ width = 9)), includeMarkdown("./tab_documentation/browsers.md") ), - tabItem(tabName = "pageview_tab", + tabItem(tabName = "pageviews", fluidRow( column(polloi::smooth_select("smoothing_pageviews"), width = 3), column(HTML("<label style = \"margin-bottom: -10px;\">Scale</label>"), @@ -433,5 +433,5 @@ ) ), - skin = "black", title = "Portal Traffic Dashboard | Discovery | Engineering | Wikimedia Foundation") + skin = "black", title = "Portal Traffic Dashboard | Discovery | Audiences | Wikimedia Foundation") } diff --git a/utils.R b/utils.R index d0e7ab5..981e4ac 100644 --- a/utils.R +++ b/utils.R @@ -225,12 +225,12 @@ us_mask <- grepl("^U\\.S\\.", first_visits_country$Country) first_visits_us <- first_visits_country[us_mask, ] first_visits_country <- first_visits_us %>% dplyr::select(-Country) %>% dplyr::group_by(Date) %>% - dplyr::summarize_each(dplyr::funs(sum)) %>% dplyr::mutate(Country="United States") %>% + dplyr::summarize_all(dplyr::funs(sum)) %>% dplyr::mutate(Country="United States") %>% rbind(first_visits_country[!us_mask,]) us_mask <- grepl("^U\\.S\\.", first_visits_country_prop$Country) first_visits_us_prop <- first_visits_country_prop[us_mask, ] first_visits_country_prop <- first_visits_us_prop %>% dplyr::select(-Country) %>% dplyr::group_by(Date) %>% - dplyr::summarize_each(dplyr::funs(sum)) %>% dplyr::mutate(Country="United States") %>% + dplyr::summarize_all(dplyr::funs(sum)) %>% dplyr::mutate(Country="United States") %>% rbind(first_visits_country_prop[!us_mask,]) first_visits_country$Region <- find_region(first_visits_country$Country, countrycode_data) first_visits_country$Region[is.na(first_visits_country$Region)] <- "Other" @@ -252,12 +252,12 @@ us_mask <- grepl("^U\\.S\\.", last_action_country$Country) last_action_us <- last_action_country[us_mask, ] last_action_country <- last_action_us %>% dplyr::select(-Country) %>% dplyr::group_by(Date) %>% - dplyr::summarize_each(dplyr::funs(sum)) %>% dplyr::mutate(Country="United States") %>% + dplyr::summarize_all(dplyr::funs(sum)) %>% dplyr::mutate(Country="United States") %>% rbind(last_action_country[!us_mask,]) us_mask <- grepl("^U\\.S\\.", last_action_country_prop$Country) last_action_us_prop <- last_action_country_prop[us_mask, ] last_action_country_prop <- last_action_us_prop %>% dplyr::select(-Country) %>% dplyr::group_by(Date) %>% - dplyr::summarize_each(dplyr::funs(sum)) %>% dplyr::mutate(Country="United States") %>% + dplyr::summarize_all(dplyr::funs(sum)) %>% dplyr::mutate(Country="United States") %>% rbind(last_action_country_prop[!us_mask,]) last_action_country$Region <- find_region(last_action_country$Country, countrycode_data) last_action_country$Region[is.na(last_action_country$Region)] <- "Other" @@ -279,12 +279,12 @@ us_mask <- grepl("^U\\.S\\.", most_common_country$Country) most_common_us <- most_common_country[us_mask, ] most_common_country <- most_common_us %>% dplyr::select(-Country) %>% dplyr::group_by(Date) %>% - dplyr::summarize_each(dplyr::funs(sum)) %>% dplyr::mutate(Country="United States") %>% + dplyr::summarize_all(dplyr::funs(sum)) %>% dplyr::mutate(Country="United States") %>% rbind(most_common_country[!us_mask,]) us_mask <- grepl("^U\\.S\\.", most_common_country_prop$Country) most_common_us_prop <- most_common_country_prop[us_mask, ] most_common_country_prop <- most_common_us_prop %>% dplyr::select(-Country) %>% dplyr::group_by(Date) %>% - dplyr::summarize_each(dplyr::funs(sum)) %>% dplyr::mutate(Country="United States") %>% + dplyr::summarize_all(dplyr::funs(sum)) %>% dplyr::mutate(Country="United States") %>% rbind(most_common_country_prop[!us_mask,]) most_common_country$Region <- find_region(most_common_country$Country, countrycode_data) most_common_country$Region[is.na(most_common_country$Region)] <- "Other" -- To view, visit https://gerrit.wikimedia.org/r/360588 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a42359c682de98dfa8d26231bd4d7cd43a25d9c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/discovery/prince Gerrit-Branch: develop Gerrit-Owner: Bearloga <mpo...@wikimedia.org> Gerrit-Reviewer: Chelsyx <c...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
