Skip to content

Commit 82a9b1b

Browse files
authored
Further Piwik.org => Matomo.org replacements (matomo-org#12415)
* renaming more Piwik mentions * some more updates * fix some tests * support matomo partially as require string * fix tests * fix failing system test * fix tests * fix system test * fix test
1 parent 92cb21b commit 82a9b1b

File tree

230 files changed

+822
-814
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+822
-814
lines changed

CHANGELOG.md

+66-66
Large diffs are not rendered by default.

CONTRIBUTING.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
Great to have you here! Read the following guide on our developer zone to learn how you can help make this project better!
44

5-
https://developer.piwik.org/guides/contributing-to-piwik-core
5+
https://developer.matomo.org/guides/contributing-to-piwik-core
66

77
## How to submit a bug report or suggest a feature?
8-
Please read the recommendations on writing a good [bug report](https://developer.piwik.org/guides/core-team-workflow#submitting-a-bug-report) or [feature request](https://developer.piwik.org/guides/core-team-workflow#submitting-a-feature-request).
8+
Please read the recommendations on writing a good [bug report](https://developer.matomo.org/guides/core-team-workflow#submitting-a-bug-report) or [feature request](https://developer.matomo.org/guides/core-team-workflow#submitting-a-feature-request).
99

1010
## How to suggest improvements to translations?
1111

12-
You can help improve translations in Piwik, please read [contribute to translations](https://github.com/piwik/piwik/blob/master/lang/README.md).
12+
You can help improve translations in Matomo, please read [contribute to translations](https://github.com/matomo-org/piwik/blob/master/lang/README.md).
1313

1414
## How to submit code improvements via pull requests?
1515

16-
You can help contribute to Piwik codebase via Pull Requests, see [Contributing to Piwik core](https://developer.piwik.org/guides/contributing-to-piwik-core)
16+
You can help contribute to Matomo codebase via Pull Requests, see [Contributing to Matomo core](https://developer.matomo.org/guides/contributing-to-piwik-core)

LEGALNOTICE

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
COPYRIGHT
22

3-
Piwik - free/libre analytics platform
3+
Matomo - free/libre analytics platform
44

55
The software package is:
66

@@ -12,17 +12,17 @@ COPYRIGHT
1212

1313
SOFTWARE LICENSE
1414

15-
The free software license of Piwik is GNU General Public License v3
15+
The free software license of Matomo is GNU General Public License v3
1616
or later. A copy of GNU GPL v3 should have been included in this
1717
software package in misc/gpl-3.0.txt.
1818

1919

2020
TRADEMARK
2121

22-
Piwik (TM) is an internationally registered trademark.
22+
Matomo (TM) is an internationally registered trademark.
2323

2424
The software license does not grant any rights under trademark
25-
law for use of the trademark. Refer to https://piwik.org/trademark/
25+
law for use of the trademark. Refer to https://matomo.org/trademark/
2626
for up-to-date trademark licensing information.
2727

2828
*
@@ -36,12 +36,12 @@ TRADEMARK
3636
CREDITS
3737

3838
The software consists of contributions made by many individuals.
39-
Major contributors are listed in https://piwik.org/the-piwik-team/.
39+
Major contributors are listed in https://matomo.org/the-piwik-team/.
4040

4141
For detailed contribution history, refer to the source, tickets,
4242
patches, and Git revision history, available at
43-
https://github.com/piwik/piwik/issues
44-
https://github.com/piwik/piwik
43+
https://github.com/matomo-org/piwik/issues
44+
https://github.com/matomo-org/piwik
4545

4646

4747
SEPARATELY LICENSED COMPONENTS AND LIBRARIES
@@ -50,31 +50,31 @@ SEPARATELY LICENSED COMPONENTS AND LIBRARIES
5050
and subject to their respective licenses.
5151

5252
Name: javascriptCode.tpl - tracking tag to embed in your web pages
53-
Link: https://github.com/piwik/piwik/blob/master/core/Tracker/javascriptTag.tpl
53+
Link: https://github.com/matomo-org/piwik/blob/master/core/Tracker/javascriptTag.tpl
5454
License: Public Domain
5555

5656
Name: jquery.truncate
57-
Link: https://github.com/piwik/piwik/blob/master/libs/jquery/truncate/
57+
Link: https://github.com/matomo-org/piwik/blob/master/libs/jquery/truncate/
5858
License: New BSD
5959

6060
Name: piwik.js - JavaScript tracker
61-
Link: https://github.com/piwik/piwik/blob/master/js/piwik.js
61+
Link: https://github.com/matomo-org/piwik/blob/master/js/piwik.js
6262
License: New BSD
6363

6464
Name: PiwikTracker - server-side tracker (PHP)
65-
Link: https://github.com/piwik/piwik/blob/master/libs/PiwikTracker/
65+
Link: https://github.com/matomo-org/piwik/blob/master/libs/PiwikTracker/
6666
License: New BSD
6767

6868
Name: DeviceDetector
69-
Link: https://github.com/piwik/device-detector
69+
Link: https://github.com/matomo-org/device-detector
7070
License: LGPL
7171

7272
Name: Piwik/Decompress
73-
Link: https://github.com/piwik/component-decompress
73+
Link: https://github.com/matomo-org/component-decompress
7474
License: LGPL v3.0
7575

7676
Name: Piwik/Network
77-
Link: https://github.com/piwik/component-network
77+
Link: https://github.com/matomo-org/component-network
7878
License: LGPL v3.0
7979

8080

@@ -243,7 +243,7 @@ THIRD-PARTY CONTENT
243243
Link: http://www.iconspedia.com/icon/neptune-4672.html
244244
License: Free for non-commercial use
245245
Notes:
246-
- used in Piwik's ExampleUI plugin
246+
- used in Matomo's ExampleUI plugin
247247

248248
Name: flag-icon-css - Lipis
249249
Link: https://github.com/lipis/flag-icon-css

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
652652
If the program does terminal interaction, make it output a short
653653
notice like this when it starts in an interactive mode:
654654

655-
Piwik Copyright (C) 2007-2017 Piwik.org
655+
Matomo Copyright (C) 2007-2018 Matomo.org
656656

657657
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
658658
This is free software, and you are welcome to redistribute it

PRIVACY.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@ In this section we document how to protect the privacy of visitors who are track
99
By default, Piwik stores the visitor IP address (IPv4 or IPv6 format) in the database for each new visitor.
1010
If a visitor has a static IP address this means her browsing history can be easily identified across several days and
1111
even across several websites tracked within the same Piwik server. You can anonymize IP addresses to ensure visitors cannot
12-
be tracked this way: [How to anonymise IP addresses.](https://piwik.org/docs/privacy/#step-1-automatically-anonymize-visitor-ips)
12+
be tracked this way: [How to anonymise IP addresses.](https://matomo.org/docs/privacy/#step-1-automatically-anonymize-visitor-ips)
1313

1414
### Delete old visitors logs
1515
By default, Piwik stores tracked data forever. To better respect the privacy of your users, it is recommended to regularly
1616
purge old data. You can configure Piwik to automatically delete log data older than a specified number of months:
17-
[How to delete old visitors log data.](https://piwik.org/docs/privacy/#step-2-delete-old-visitors-logs)
17+
[How to delete old visitors log data.](https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs)
1818

1919
### Include a tracking Opt-Out feature on your site
2020
In your website, we recommended providing an easy way for your visitors to “opt-out” of being tracked by Piwik.
2121
You can use the Opt-Out feature to display a link your website that sets a special browser cookie (`piwik_ignore`) when
2222
clicked. Visitors that click that link will be ignored by Piwik in the future:
23-
[How to include a tracking opt-out iframe.](https://piwik.org/docs/privacy/#step-3-include-a-web-analytics-opt-out-feature-on-your-site-using-an-iframe)
23+
[How to include a tracking opt-out iframe.](https://matomo.org/docs/privacy/#step-3-include-a-web-analytics-opt-out-feature-on-your-site-using-an-iframe)
2424

2525
### Respect DoNotTrack preference
2626
Do Not Track is a browser-level technology and policy proposal that lets visitors opt out of tracking by websites they
2727
do not visit. Visitors can enable this preference in their browser, and then it's up to Piwik to respect it. By default,
2828
Piwik is configured to ignore visitors that have enabled it:
29-
[How to check if your Piwik respects DoNotTrack.] (https://piwik.org/docs/privacy/#step-4-respect-donottrack-preference)
29+
[How to check if your Piwik respects DoNotTrack.] (https://matomo.org/docs/privacy/#step-4-respect-donottrack-preference)
3030

3131
### Disable tracking cookies
3232
A cookie is a collection of information that a website stores on a visitor’s computer and accesses each time the visitor
3333
returns. By default, Piwik uses cookies to aid in tracking visitor behavior. If someone gains access to a visitor's
3434
computer, they could learn a few things about how the visitor visited your website. For many websites, this isn't a
3535
problem, but for others where a strong level of privacy is required (like online banking), disabling tracking cookies may
36-
be a good idea: [How to disable tracking cookies.](https://piwik.org/faq/general/faq_157/)
36+
be a good idea: [How to disable tracking cookies.](https://matomo.org/faq/general/faq_157/)
3737

3838
### Keep your visitors details private
3939
Any user that has at least `view` access (the default access level) to Piwik can view detailed information for all users
@@ -49,12 +49,12 @@ In this section we document how a Piwik administrator can better protect their o
4949
By default, the Piwik Javascript code on all tracked websites contains the Piwik server URL. In some cases you might
5050
want to hide this Piwik URL completely while still tracking all websites in your Piwik instance. To hide your Piwik
5151
server's URL, you can modify the Javascript Tracking code and point it to a proxy piwik.php script instead of your actual
52-
Piwik server: [How to keep Piwik server URL private.](https://piwik.org/faq/how-to/faq_132/)
52+
Piwik server: [How to keep Piwik server URL private.](https://matomo.org/faq/how-to/faq_132/)
5353

5454
### Automatic update check
5555
From time to time, Piwik uses `api.piwik.org` to check if the current version of Piwik is the latest version of Piwik.
5656
If an update is available, a notification is displayed allowing you to upgrade Piwik. To disable the update check,
5757
and stop your instance from sending HTTP requests to `api.piwik.org`, deactivate the "Automatic update" feature by
5858
setting `enable_auto_update = 0` in your configuration file `config/config.ini.php`.
5959

60-
Learn more about [Privacy in Piwik](https://piwik.org/privacy/).
60+
Learn more about [Privacy in Piwik](https://matomo.org/privacy/).

README.md

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Piwik - piwik.org
1+
# Matomo (formerly Piwik) - matomo.org
22

3-
[![Latest Stable Version](https://poser.pugx.org/piwik/piwik/v/stable)](https://piwik.org/download/)
3+
[![Latest Stable Version](https://poser.pugx.org/piwik/piwik/v/stable)](https://matomo.org/download/)
44
[![Latest Unstable Version](https://poser.pugx.org/piwik/piwik/v/unstable)](https://packagist.org/packages/piwik/piwik)
5-
[![License](https://poser.pugx.org/piwik/piwik/license)](https://piwik.org/free-software/)
5+
[![License](https://poser.pugx.org/piwik/piwik/license)](https://matomo.org/free-software/)
66

77
## Code Status
88

@@ -14,13 +14,13 @@
1414

1515
## Description
1616

17-
Piwik is the leading Free/Libre open analytics platform.
17+
Matomo is the leading Free/Libre open analytics platform.
1818

19-
Piwik is a full featured PHP MySQL software program that you download and install on your own webserver.
19+
Matomo is a full featured PHP MySQL software program that you download and install on your own webserver.
2020
At the end of the five minute installation process you will be given a JavaScript code.
2121
Simply copy and paste this tag on websites you wish to track and access your analytics reports in real time.
2222

23-
Piwik aims to be a Free software alternative to Google Analytics, and is already used on more than 1,000,000 websites. Privacy is built-in!
23+
Matomo aims to be a Free software alternative to Google Analytics, and is already used on more than 1,000,000 websites. Privacy is built-in!
2424

2525
## Mission Statement
2626

@@ -31,92 +31,92 @@ Or in short:
3131
3232
## License
3333

34-
Piwik is released under the GPL v3 (or later) license, see [misc/gpl-3.0.txt](misc/gpl-3.0.txt)
34+
Matomo is released under the GPL v3 (or later) license, see [misc/gpl-3.0.txt](misc/gpl-3.0.txt)
3535

3636

3737
## Requirements
3838

3939
* PHP 5.5.9 or greater
4040
* MySQL version 5.5 or greater, or MariaDB
4141
* PHP extension pdo and pdo_mysql, or the MySQLi extension.
42-
* Piwik is OS / server independent
42+
* Matomo is OS / server independent
4343

44-
See https://piwik.org/docs/requirements/
44+
See https://matomo.org/docs/requirements/
4545

4646
## Install
4747

48-
* Upload piwik to your webserver
48+
* Upload matomo to your webserver
4949
* Point your browser to the directory
5050
* Follow the steps
5151
* Add the given javascript code to your pages
5252
* (You may also generate fake data to experiment, by enabling the plugin VisitorGenerator)
5353

54-
See https://piwik.org/docs/installation/
54+
See https://matomo.org/docs/installation/
5555

5656
## Free trial
5757

58-
If you do not have a server or don't want to host yourself you can use our Piwik Cloud partner service (30 day free trial): https://www.innocraft.cloud/
58+
If you do not have a server or don't want to host yourself you can use our Matomo Cloud partner service (30 day free trial): https://www.innocraft.cloud/
5959

6060
## Online Demo
6161

62-
Check out the online demo for Piwik at [demo.piwik.org](https://demo.piwik.org/)
62+
Check out the online demo for Matomo at [demo.matomo.org](https://demo.matomo.org/)
6363

6464
## Changelog
6565

66-
For the list of all tickets closed in the current and past releases, see https://piwik.org/changelog/. For the list of technical changes in the Piwik platform, see [https://developer.piwik.org/changelog](https://developer.piwik.org/changelog).
66+
For the list of all tickets closed in the current and past releases, see https://matomo.org/changelog/. For the list of technical changes in the Matomo platform, see [https://developer.matomo.org/changelog](https://developer.matomo.org/changelog).
6767

6868
## Get involved!
6969

70-
We believe in liberating Web Analytics, providing a free platform for simple and advanced analytics. Piwik was built by dozens of people like you,
71-
and we need your help to make Piwik better… Why not participate in a useful project today? [Learn how you can contribute to Piwik.](https://piwik.org/get-involved)
70+
We believe in liberating Web Analytics, providing a free platform for simple and advanced analytics. Matomo was built by dozens of people like you,
71+
and we need your help to make Matomo better… Why not participate in a useful project today? [Learn how you can contribute to Matomo.](https://matomo.org/get-involved)
7272

7373
## Quality Assurance
7474

75-
The Piwik project uses an ever-expanding comprehensive set of thousands of unit tests and hundreds of automated integration tests, system tests, JavaScript tests, and screenshot UI tests, running on a continuous integration server as part of its software quality assurance. [Learn more](https://piwik.org/qa/)
75+
The Matomo project uses an ever-expanding comprehensive set of thousands of unit tests and hundreds of automated integration tests, system tests, JavaScript tests, and screenshot UI tests, running on a continuous integration server as part of its software quality assurance. [Learn more](https://matomo.org/qa/)
7676

77-
We use [BrowserStack.com](https://www.browserstack.com/) testing tool to help check the Piwik user interface is compatible with many browsers.
77+
We use [BrowserStack.com](https://www.browserstack.com/) testing tool to help check the Matomo user interface is compatible with many browsers.
7878

7979

8080
## Security
8181

82-
Security is a top priority at Piwik. As potential issues are discovered, we validate, patch and release fixes as quickly as we can. We have a security bug bounty program in place that rewards researchers for finding security issues and disclosing them to us.
82+
Security is a top priority at Matomo. As potential issues are discovered, we validate, patch and release fixes as quickly as we can. We have a security bug bounty program in place that rewards researchers for finding security issues and disclosing them to us.
8383

84-
[Learn more](https://piwik.org/security/)
84+
[Learn more](https://matomo.org/security/)
8585

86-
## Support for Piwik
86+
## Support for Matomo
8787

88-
For **Free support**, post a message in our community forums: [forum.piwik.org](https://forum.piwik.org/)
88+
For **Free support**, post a message in our community forums: [forum.matomo.org](https://forum.matomo.org/)
8989

90-
For **Professional paid support**, send a message to our network of Piwik professionals: [piwik.org/support](https://piwik.org/contact/)
90+
For **Professional paid support**, send a message to our network of Matomo professionals: [matomo.org/support](https://matomo.org/contact/)
9191

9292
## Contact
9393

94-
Website: [piwik.org](https://piwik.org)
94+
Website: [matomo.org](https://matomo.org)
9595

96-
About us: [piwik.org/team/](https://piwik.org/team/)
96+
About us: [matomo.org/team/](https://matomo.org/team/)
9797

98-
Contact us: [piwik.org/contact/](https://piwik.org/contact/)
98+
Contact us: [matomo.org/contact/](https://matomo.org/contact/)
9999

100100

101101
## More information
102102

103-
What makes Piwik unique from the competition:
103+
What makes Matomo unique from the competition:
104104

105-
* Real time web analytics reports: in Piwik, reports are by default generated in real time.
105+
* Real time web analytics reports: in Matomo, reports are by default generated in real time.
106106
For high traffic websites, you can choose the frequency for reports to be processed.
107107

108-
* You own your web analytics data: since Piwik is installed on your server, the data is stored in your own database and you can get all the statistics using the powerful Piwik Analytics API.
108+
* You own your web analytics data: since Matomo is installed on your server, the data is stored in your own database and you can get all the statistics using the powerful Matomo Analytics API.
109109

110-
* Piwik is a Free Software which can easily be configured to respect your visitors' privacy.
110+
* Matomo is a Free Software which can easily be configured to respect your visitors' privacy.
111111

112112
* Modern, easy to use User Interface: you can fully customize your dashboard, drag and drop widgets and more.
113113

114-
* Piwik features are built inside plugins: you can add new features and remove the ones you don’t need.
115-
You can build your own web analytics plugins or hire a consultant to have your custom feature built in Piwik
114+
* Matomo features are built inside plugins: you can add new features and remove the ones you don’t need.
115+
You can build your own web analytics plugins or hire a consultant to have your custom feature built in Matomo
116116

117117
* Vibrant international Open community of more than 200,000 active users (tracking even more websites!)
118118

119119
* Advanced Web Analytics capabilities such as Ecommerce Tracking, Goal tracking, Campaign tracking,
120120
Custom Variables, Email Reports, Custom Segment Editor, Geo Location, Real time maps, and more!
121121

122-
Documentation and more info on https://piwik.org
122+
Documentation and more info on https://matomo.org

SECURITY.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ The Piwik Security Bug Bounty Program is designed to encourage security research
77

88
## Responsible disclosure by email
99

10-
If you have found a security issue in Piwik please read [our security notes](https://piwik.org/security/) regarding responsible disclosures.
10+
If you have found a security issue in Piwik please read [our security notes](https://matomo.org/security/) regarding responsible disclosures.
1111

12-
[Email your Report Vulnerability to the Piwik Security team](mailto:security@piwik.org?subject=Reporting%20Vulnerability%20in%20Piwik)
12+
[Email your Report Vulnerability to the Piwik Security team](mailto:security@matomo.org?subject=Reporting%20Vulnerability%20in%20Piwik)
1313

1414

1515
## Improve your Piwik Server Security
1616

17-
[Secure Piwik server](https://piwik.org/docs/how-to-secure-piwik/): follow these steps to keep your Piwik data safe.
17+
[Secure Piwik server](https://matomo.org/docs/how-to-secure-piwik/): follow these steps to keep your Piwik data safe.
1818

1919
## Security announcements
2020

21-
Please subscribe to [the Changelog](https://piwik.org/changelog/) ([rss feed](https://piwik.org/changelog/feed/)) to be notified of new releases (including security releases).
21+
Please subscribe to [the Changelog](https://matomo.org/changelog/) ([rss feed](https://matomo.org/changelog/feed/)) to be notified of new releases (including security releases).

0 commit comments

Comments
 (0)