Skip to content

Commit

Permalink
Merge branch '5.x-dev' into poc-simpler-log-aggregation
Browse files Browse the repository at this point in the history
  • Loading branch information
diosmosis committed Aug 10, 2023
2 parents 5e1311a + 22558e4 commit 490dd81
Show file tree
Hide file tree
Showing 406 changed files with 2,184 additions and 3,675 deletions.
3 changes: 0 additions & 3 deletions .github/scripts/clean-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,6 @@ rm -rf node_modules/jquery-ui-dist/jquery-ui.js
rm -rf node_modules/jquery-ui-dist/jquery-ui.structure.css
rm -rf node_modules/jquery-ui-dist/jquery-ui.theme.css

rm -rf node_modules/jquery.browser/test
rm -rf node_modules/jquery.browser/dist/jquery.browser.js

rm -rf node_modules/jquery.dotdotdot/gulpfile.js
rm -rf node_modules/jquery.dotdotdot/index.html
rm -rf node_modules/jquery.dotdotdot/dotdotdot.jquery.json
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ docker-compose.yml
!/node_modules/jquery
!/node_modules/jquery-mousewheel
!/node_modules/jquery-ui-dist
!/node_modules/jquery.browser
!/node_modules/jquery.dotdotdot
!/node_modules/jquery.scrollto
!/node_modules/@materializecss/materialize
Expand Down
7 changes: 5 additions & 2 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"customSyntax": "postcss-less"
}
],
"ignoreFiles": ["node_modules/**/*", "vendor/**/*", "tests/**/*", "tmp/**/*", "misc/**/*", "plugins/*/vue/dist/*", "plugins/Morpheus/stylesheets/base/bootstrap.css"],
"ignoreFiles": ["node_modules/**/*", "vendor/**/*", "tests/**/*", "tmp/**/*", "misc/**/*", "plugins/*/vue/dist/*", "plugins/*/tests/**/*", "plugins/Morpheus/stylesheets/base/bootstrap.css"],
"rules": {
"color-no-invalid-hex": true,
"no-irregular-whitespace": true,
Expand All @@ -19,6 +19,9 @@
],
"font-family-no-duplicate-names": true,
"no-duplicate-at-import-rules": true,
"no-duplicate-selectors": true
"no-duplicate-selectors": true,
"comment-whitespace-inside": "always",
"unit-no-unknown": true,
"selector-anb-no-unmatchable": true
}
}
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)*
* By default, the last ip address in the proxy list will now be used rather than the first ip address. To force the first ip address to be used set the config option `proxy_ip_read_last_in_list = 0`.
* The deprecated method `Piwik\Log::setLogLevel()` has been removed
* The deprecated method `Piwik\Log::getLogLevel()` has been removed
* A parameter `$login` has been added to the methods `setCompleted()`, `isCompleted()`, `skipChallenge()` and `isSkipped()` in the `Piwik\Plugins\Tour\Engagement\Challenge` class
* In order to encapsulate Matomo's dependencies from direct usage in plugins we introduce some proxy classes and patterns that need to be used instead. For plugin development avoid using any external Matomo dependency directly.
* Use `Piwik\Log\Logger` instead of `Monolog\Logger`
* Use `Piwik\Log\LoggerInterface` instead of `Psr\Log\LoggerInterface`
Expand All @@ -42,6 +43,8 @@ The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)*
* For progress bars use the methods `initProgressBar`, `startProgressBar`, `advanceProgressBar` and `finishProgressBar`
* Tables can be rendered using the new method `renderTable`
* For executing another command within your command use the new method `runCommand`
* Requests sent by Matomo to plugins.matomo.org will no longer include an `HTTP_X_FORWARDED_FOR` header containing the current user's IP address. If you use an outbound proxy rule that used this header to allow access for Matomo then it should be replaced with rule allowing access by IP and/or URL.
* Matomo does no longer include the jQuery browser plugin. If your plugin requires it, you need to include it yourself.

### New APIs

Expand All @@ -53,6 +56,7 @@ The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)*

* The method `Common::getRequestVar` is now deprecated, but will remain API until Matomo 6. You may already start using the new class `Piwik\Request` instead, but ensure to handle needed sanitizing / escaping yourself.
* The brand related less variables for colors `color-black-piwik`, `color-blue-piwik`, `color-red-piwik` and `color-green-piwik` are now deprecated and will be removed in Matomo 6. New variables where `piwik` was replaced with `matomo` have been introduced. E.g. `color-black-matomo`
* Support for jQuery UI is now depreated and might be removed in one of the next major releases. Please consider using Materialize CSS or Vue.js instead.

### Removed Config

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"matomo/matomo-php-tracker": "~3.0",
"matomo/network": "~2.0",
"matomo/referrer-spam-list": "dev-master",
"matomo/searchengine-and-social-list": "~3.0",
"matomo/searchengine-and-social-list": "dev-master",
"monolog/monolog": "~1.11",
"mustangostang/spyc": "^0.6.0",
"pear/pear_exception": "~1.0.0",
Expand Down
Loading

0 comments on commit 490dd81

Please sign in to comment.