InfinityVoid · InfinityVoid · Oct 11, 2018 · Jun 12, 2018 · Jun 12, 2018 · Jun 12, 2018
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,8 @@ php_errors.log
 /js/yui*
 /misc/*.dat
 /misc/*.dat.gz
+/misc/*.tar.gz
+/misc/*.mmdb
 /misc/user/logo-header.png
 /misc/user/logo.png
 /misc/user/logo.svg

diff --git a/.lfsconfig b/.lfsconfig
@@ -0,0 +1,2 @@
+[lfs]
+	fetchexclude = *
diff --git a/.travis.yml b/.travis.yml
@@ -16,12 +16,7 @@ services:
 
 addons:
   apt:
-    sources:
-      - deadsnakes
-
     packages:
-      - python2.6
-      - python2.6-dev
       - nginx
       - realpath
       - lftp
@@ -42,26 +37,36 @@ matrix:
   include:
     # PDO Mysql
     - php: 5.6
-      env: TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL
+      env: TEST_SUITE=SystemTestsCore MYSQL_ADAPTER=PDO_MYSQL
+      sudo: required
+    - php: 5.6
+      env: TEST_SUITE=SystemTestsPlugins MYSQL_ADAPTER=PDO_MYSQL
       sudo: required
     - php: 5.6
       env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
       sudo: required
     - php: 5.6
       env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
       sudo: false
+      addons: false
     # Javascript tests
     - php: 5.6
       env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
       sudo: false
+      addons:
+        apt:
+          packages:
+            - nginx
+            - realpath
     - php: 5.6
       env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1
       sudo: false
+      addons: false
     # All tests after another
-    - php: 5.6
+    - php: 7
       env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI ALLTEST_EXTRA_OPTIONS="--run-first-half-only"
       sudo: required
-    - php: 5.6
+    - php: 7
       env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI ALLTEST_EXTRA_OPTIONS="--run-second-half-only"
       sudo: required
     # UITests use a specific version because the default 5.5 (== 5.5.38) is missing FreeType support
@@ -105,27 +110,6 @@ before_script:
   # make tmpfs and run MySQL on it for reasonnable performance
   - ./tests/travis/setup_mysql_tmpfs.sh
 
-  # print out mysql information
-  - mysql --version
-  - mysql -e "SELECT VERSION();"
-
-  # configure mysql
-  - mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'" # Travis default
-  # try to avoid 'mysql has gone away' errors
-  - mysql -e "SET GLOBAL wait_timeout = 36000;"
-  - mysql -e "SET GLOBAL max_allowed_packet = 134209536;"
-  - mysql -e "SHOW VARIABLES LIKE 'max_allowed_packet';"
-  - mysql -e "SHOW VARIABLES LIKE 'wait_timeout';"
-
-  - mysql -e "SELECT @@sql_mode;"
-  # - mysql -e "SHOW GLOBAL VARIABLES;"
-
-  # print out more debugging info
-  - uname -a
-  - date
-  - php -r "var_dump(gd_info());"
-  - mysql -e 'create database piwik_tests;'
-
   - ./tests/travis/prepare.sh
   - ./tests/travis/setup_webserver.sh
   - ./tests/travis/install_phantomjs.sh; export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH;
@@ -152,6 +136,7 @@ after_success:
 cache:
   directories:
     - "travis_phantomjs"
+    - $HOME/.composer/cache
 
 
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,14 +4,97 @@ This is the Developer Changelog for Matomo platform developers. All changes in o
 
 The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)** lets you see more details about any Matomo release, such as the list of new guides and FAQs, security fixes, and links to all closed issues. 
 
-## Matomo 3.3.1
+## Matomo 3.6.1
+
+### New APIs
+
+* Added new event `Access.modifyUserAccess` which lets plugins modify current user's access levels/permissions.
+
+### New Developer Features
+
+* Logging to a file can now be easily enabled during tests. A new `[tests] enable_logging` INI option has been added, which you can set to `1` to enable logging for all tests. The `tests:run` and `tests:run-ui` commands now both have an `--enable-logging` option to enable logging for a specific run.
+
+## Matomo 3.6.0
+
+### New Features
+
+* A new role has introduced called "write" which has less permissions than an admin but more than a view only user ([see FAQ](https://matomo.org/faq/general/faq_26910/)).
+* Custom currencies can now be added using the `currencies[]` configuration key.
+* A new segment `eventValue` lets you select all users who tracked a custom event with a given value or range of values.
+
+### New config.ini.php settings
+
+* `archiving_profile = 0`, if set to 1, core:archive profiling information will be recorded in a log file. the log file is determined by the `archive_profiling_log` option.
+* `archive_profiling_log = `, if set to an absolute path, core:archive profiling information will be logged to specified file.
+* `enable_internet_features=0` will now fully disable Internet access by preventing all outgoing connections. Note: changing this setting is not recommended for security, because you will lose the easy auto-update and email notifications.
+* `login_whitelist_ip[]` now supports hostnames so you can [whitelist](https://matomo.org/faq/how-to/faq_25543/) your IP addresses and/or Hostnames and keep your Matomo secure.
+
+### Updated commands
+
+* New parameter `--concurrent-archivers` to define the number of maximum archivers to run in parallel on this server. Useful to prevent archiving processes piling up and ultimately failing.
+
+### New APIs
+
+* Added new event `API.addGlossaryItems` which lets you add items to the glossary.
+* Added new event `Tracker.detectReferrerSocialNetwork` which lets you add custom social network detections
+* Added new event `Report.unsubscribe` which is triggered whenever someone unsubscribe from a report
+* Added new API method `UsersManager.getAvailableRoles` to fetch a list of all available roles that can be granted to a user.
+* Added new API method `UsersManager.getAvailableCapabilities` to fetch a list of all available capabilities that can be granted to a user.
+* Added new API method `UsersManager.addCapabilities` to grant one or multiple capabilities to a user.
+* Added new API method `UsersManager.removeCapabilities` to remove one or multiple capabilities from a user.
+* The API method `UsersManager.setUserAccess` now accepts an array to pass a role and multiple capabilities at once.
+* Plugin classes can overwrite the method `requiresInternetConnection` to define if they should be automatically unloaded if no internet connection is available (enable_internet_features = 0)
+* Added two new methods to the JS tracker: `removeEcommerceItem` and `clearEcommerceCart` to allow better control over what is in the ecommerce cart.
+* Tracking API requests now include `&consent=1` in the Tracking API URL When [consent](https://developer.matomo.org/guides/tracking-javascript-guide#asking-for-consent) has been given by a user.
+
+### Breaking Changes
+* Changed some menu items to use translation keys instead (see [PR #12885](https://github.com/matomo-org/matomo/pull/12885)).
+* The methods `assertResponseCode()` and `assertHttpResponseText()` in `Piwik\Tests\Framework\TestCase\SystemTestCase` have been deprecated and will be removed in Matomo 4.0. Please use `Piwik\Http` instead.
+* The classes `PHPUnit\Framework\Constraint\HttpResponseText` and `PHPUnit\Framework\Constraint\ResponseCode` have been deprecated and will be removed in Matomo 4.0. Please use `Piwik\Http` instead.
+* Creating links through the Proxy has been deprecated. Use rel="nofollow" instead.
+* The console option `--piwik-domain` has been deprecated and will be removed in Matomo 4.0. Use `--matomo-domain` instead
+* Social networks are now detected as new referrer type (ID=7), which allows improved reports and better segmentation
+* New settings form field UI component "Field Array" that lets users enter multiple values for one setting as a flat array
+
+## Matomo 3.5.1
+
+### New APIs
+
+* Added new method `Piwik\API\Request::isRootRequestApiRequest()` to detect if the root request is an API request.
+
+## Matomo 3.5.0
+
+### Breaking Changes
+
+* Flattened action url reports now always include a leading `/` and will no longer include the `default_action_name`. e.g. `path/to/index` will now be `/path/to/`. This might affect configured custom alerts, as this plugin uses the flattened url reports for comparison.
+
+### New APIs
+
+* New JavaScript tracker functions to [ask for consent](https://developer.matomo.org/guides/tracking-javascript-guide#asking-for-consent): `requireConsent`, `rememberConsentGiven`, `setConsentGiven`, `forgetConsentGiven`.
+
+### New Features
+* New events `PrivacyManager.deleteLogsOlderThan`, `PrivacyManager.exportDataSubjects` and `PrivacyManager.deleteDataSubjects` to enable plugins to be GDPR compliant.  
+* New event `AssetManager.addStylesheets` to add additional less styles which are not located in a file.
+* New event `Archiving.getIdSitesToMarkArchivesAsInvalidated` that lets plugins customize the behaviour of report invalidations.
+* Reports and visualizations can now disable the 'all' rows limit selector: `$view->config->disable_all_rows_filter_limit`.
+* New settings form field UI component "Multi Tuple" that lets users enter multiple values for one setting
+
+## Matomo 3.4.0
 
 ### Breaking Changes
 `piwik` font is deprecated and will be removed in Matomo 4.0. Please use new `matomo` font instead
+Sending synchronous requests using ajaxHelper is now deprecated. All requests will be send async as of Matomo 4.0
 
 ### New APIs
 * A new JavaScript tracker method `resetUserId` has been added to allow clearing user and visitor id.
 * A new event `Actions.addActionTypes` has been added, to allow plugins to add their custom action types.
+* Dashboard API has been extended by the methods `copyDashboardToUser`, `createNewDashboardForUser`, `removeDashboard` and `resetDashboardLayout`
+  * It is also now possible to delete the first dashboard for a user for automation purposes. Doing so and not adding a new first dashboard might result in buggy UX.
+  * `getDashboards` API method has been extended by additional parameters to fetch dashboards for specific user
+* A new event `API.Request.intercept` has been added which allows plugins to intercept API requests to perform custom logic, overriding the original API method.
+* A new event `Request.shouldDisablePostProcessing` has been added which allows plugins to disable DataTable post processing for individual API requests.
+* A new event `SitesManager.shouldPerformEmptySiteCheck` has been added to allow plugins to disable the empty site check for individual sites.
+* A new JavaScript tracker method `getCrossDomainLinkingUrlParameter` has been added so you can add cross domain tracking capability to dynamically created links. [Learn here how to append the result to said links' URLs, see the section "Advanced: Handling Dynamically Generated Links"](https://matomo.org/faq/how-to/faq_23654/) 
 
 ## Matomo 3.3.0
 
@@ -21,6 +104,12 @@ Piwik is now Matomo. Read more about this change in the [official announcement](
 
 * New HTTP API `API.getMatomoVersion` was introduced. The previous HTTP API `API.getPiwikVersion` will still work but will now be hidden from the API reference page.
 
+## Piwik 3.2.2
+
+### Breaking Changes
+* The `historyService` along with `broadcast.init`, `broadcast.propagateAjax`, `broadcast.pageLoad` have been deprecated and will be removed in Piwik 4. 
+
+
 ## Piwik 3.2.1
 
 ### New APIs

diff --git a/LEGALNOTICE b/LEGALNOTICE
@@ -126,9 +126,9 @@ THIRD-PARTY COMPONENTS AND LIBRARIES
 	Link: https://github.com/tedivm/jshrink
 	License: BSD-3-Clause
 
-	Name:  sparkline
-	Link:  https//sourceforge.net/projects/sparkline/
-	License:  Dual-licensed: New BSD or GPL v2
+	Name:  Sparkline
+	Link:  https://github.com/jamiebicknell/Sparkline
+	License:  MIT
 
 	Name:  sprintf
 	Link:  http://www.diveintojavascript.com/projects/javascript-sprintf
@@ -270,11 +270,11 @@ THIRD-PARTY CONTENT
 	License: GPL
 	By: Alessandro Rei - http://www.kde-look.org/usermanager/search.php?username=mentalrey
 
-	Name: Material icons ("icon-info2", "icon-outline", "icon-settings", "icon-form", "icon-play", "icon-pause", "icon-replay", "icon-skip-next", "icon-skip-forward", "icon-stop", "icon-fast-forward", "icon-fast-rewind") in plugins/Morpheus/fonts
+	Name: Material icons ("icon-info2", "icon-outline", "icon-settings", "icon-form", "icon-play", "icon-pause", "icon-replay", "icon-skip-next", "icon-skip-forward", "icon-stop", "icon-fast-forward", "icon-fast-rewind", "icon-bug", "icon-upload") in plugins/Morpheus/fonts
 	Link: https://design.google.com/icons/
 	License: Apache License Version 2.0
 
-	Name: IcoMoon - Free icons ("icon-funnel", "icon-lab", "icon-archive") in plugins/Morpheus/fonts
+	Name: IcoMoon - Free icons ("icon-funnel", "icon-lab", "icon-archive", "icon-rocket", "icon-embed") in plugins/Morpheus/fonts
 	Link: https://icomoon.io/#icons-icomoon
 	License: GPL
 

diff --git a/PRIVACY.md b/PRIVACY.md
@@ -1,60 +1,60 @@
 # Privacy 
-This is a summary of all of the components within Piwik which may affect your privacy in some way. Please keep in mind
+This is a summary of all of the components within Matomo which may affect your privacy in some way. Please keep in mind
 third party Themes, Plugins or Apps may introduce privacy concerns not listed here.
 
-## Privacy for users being tracked by Piwik
-In this section we document how to protect the privacy of visitors who are tracked by your Piwik analytics service.
+## Privacy for users being tracked by Matomo
+In this section we document how to protect the privacy of visitors who are tracked by your Matomo analytics service.
 
 ### Anonymise visitor IP addresses
-By default, Piwik stores the visitor IP address (IPv4 or IPv6 format) in the database for each new visitor. 
+By default, Matomo stores the visitor IP address (IPv4 or IPv6 format) in the database for each new visitor. 
 If a visitor has a static IP address this means her browsing history can be easily identified across several days and
-even across several websites tracked within the same Piwik server. You can anonymize IP addresses to ensure visitors cannot
+even across several websites tracked within the same Matomo server. You can anonymize IP addresses to ensure visitors cannot
 be tracked this way: [How to anonymise IP addresses.](https://matomo.org/docs/privacy/#step-1-automatically-anonymize-visitor-ips)
 
 ### Delete old visitors logs
-By default, Piwik stores tracked data forever. To better respect the privacy of your users, it is recommended to regularly
-purge old data. You can configure Piwik to automatically delete log data older than a specified number of months: 
+By default, Matomo stores tracked data forever. To better respect the privacy of your users, it is recommended to regularly
+purge old data. You can configure Matomo to automatically delete log data older than a specified number of months: 
 [How to delete old visitors log data.](https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs)
 
 ### Include a tracking Opt-Out feature on your site
-In your website, we recommended providing an easy way for your visitors to “opt-out” of being tracked by Piwik. 
+In your website, we recommended providing an easy way for your visitors to “opt-out” of being tracked by Matomo. 
 You can use the Opt-Out feature to display a link your website that sets a special browser cookie (`piwik_ignore`) when
-clicked. Visitors that click that link will be ignored by Piwik in the future: 
+clicked. Visitors that click that link will be ignored by Matomo in the future: 
 [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)
 
 ### Respect DoNotTrack preference
 Do Not Track is a browser-level technology and policy proposal that lets visitors opt out of tracking by websites they
-do not visit. Visitors can enable this preference in their browser, and then it's up to Piwik to respect it. By default,
-Piwik is configured to ignore visitors that have enabled it: 
-[How to check if your Piwik respects DoNotTrack.] (https://matomo.org/docs/privacy/#step-4-respect-donottrack-preference)
+do not visit. Visitors can enable this preference in their browser, and then it's up to Matomo to respect it. By default,
+Matomo is configured to ignore visitors that have enabled it: 
+[How to check if your Matomo respects DoNotTrack.] (https://matomo.org/docs/privacy/#step-4-respect-donottrack-preference)
 
 ### Disable tracking cookies
 A cookie is a collection of information that a website stores on a visitor’s computer and accesses each time the visitor
-returns. By default, Piwik uses cookies to aid in tracking visitor behavior. If someone gains access to a visitor's
+returns. By default, Matomo uses cookies to aid in tracking visitor behavior. If someone gains access to a visitor's
 computer, they could learn a few things about how the visitor visited your website. For many websites, this isn't a
 problem, but for others where a strong level of privacy is required (like online banking), disabling tracking cookies may
 be a good idea: [How to disable tracking cookies.](https://matomo.org/faq/general/faq_157/)
 
 ### Keep your visitors details private
-Any user that has at least `view` access (the default access level) to Piwik can view detailed information for all users
-tracked in Piwik (such as their IP addresses, visitor IDs, details of all past visits and actions, etc.) through features
-provided by the `Live` plugin (such as the Visitor Log and Visitor Profile). As the Piwik administrator, you may decide
+Any user that has at least `view` access (the default access level) to Matomo can view detailed information for all users
+tracked in Matomo (such as their IP addresses, visitor IDs, details of all past visits and actions, etc.) through features
+provided by the `Live` plugin (such as the Visitor Log and Visitor Profile). As the Matomo administrator, you may decide
 that not all of your users need access to this data. You can deactivate the `Live` plugin to prevent users from viewing
 visitor details in the Administration > Plugins page.
 
-## Privacy for Piwik admins and website owners
-In this section we document how a Piwik administrator can better protect their own privacy.
+## Privacy for Matomo admins and website owners
+In this section we document how a Matomo administrator can better protect their own privacy.
 
-### Keep your Piwik server URL private
-By default, the Piwik Javascript code on all tracked websites contains the Piwik server URL. In some cases you might
-want to hide this Piwik URL completely while still tracking all websites in your Piwik instance. To hide your Piwik
+### Keep your Matomo server URL private
+By default, the Matomo Javascript code on all tracked websites contains the Matomo server URL. In some cases you might
+want to hide this Matomo URL completely while still tracking all websites in your Matomo instance. To hide your Matomo
 server's URL, you can modify the Javascript Tracking code and point it to a proxy piwik.php script instead of your actual
-Piwik server: [How to keep Piwik server URL private.](https://matomo.org/faq/how-to/faq_132/)
+Matomo server: [How to keep Matomo server URL private.](https://matomo.org/faq/how-to/faq_132/)
 
 ### Automatic update check
-From time to time, Piwik uses `api.piwik.org` to check if the current version of Piwik is the latest version of Piwik.
-If an update is available, a notification is displayed allowing you to upgrade Piwik. To disable the update check,
-and stop your instance from sending HTTP requests to `api.piwik.org`, deactivate the "Automatic update" feature by
+From time to time, Matomo uses `api.matomo.org` to check if the current version of Matomo is the latest version of Matomo.
+If an update is available, a notification is displayed allowing you to upgrade Matomo. To disable the update check,
+and stop your instance from sending HTTP requests to `api.matomo.org`, deactivate the "Automatic update" feature by
 setting `enable_auto_update = 0` in your configuration file `config/config.ini.php`.
 
-Learn more about [Privacy in Piwik](https://matomo.org/privacy/).
+Learn more about [Privacy in Matomo](https://matomo.org/privacy/).