New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge branch '3.x-dev' into '4.x-dev' #15600
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* updates device detector to latest release * updates tests
* Lock key start * do not empty key lock Co-authored-by: Thomas Steur <tsteur@users.noreply.github.com>
…sing GeoIp2 plugin. (#15447)
…s/sites if they want. (#15457) * Add event that allows plugins to disable archiving for certain periods/sites if they want. * apply review feedback
Better patch for #15401 which was merged last minute... This way it always works even when someone calls `acquireLock` directly instead of `execute` Pushing this for now into 3.x-dev but can also put it into 4.x-dev directly but then there might be merge conflicts when merging 3.x-dev into 4.x-dev
1) Too few arguments to function mb_strtolower(), 1 passed in matomo/vendor/davaxi/sparkline/src/Sparkline/StyleTrait.php on line 129 and exactly 2 expected 2) mb_strlen is not defined
* update icons submodule * update UI tests
* Clear general cache less often during archiving * add comment * remove not needed clear cache
Follow up from #14771 Have been debugging and the above PR alone did not help since the `PsrLogMessageProcessor` would call the toString method of the exception and add the message again. This makes sure the logs are more readble.
…15570) * Add comparison change to ViewDataTable as well. * another comparison fix * Undo change. * remove some uses
* Fallback to JSON renderer if no valid format is given Prevents exceptions like these which we are getting quite often due to security researchers trying different inputs > Call to a member function getResponseException() on null","file":"\/core\/API\/Request.php","line":279,"request_id":"3e2b6","backtrace":" on \/var\/www\/html\/core\/API\/Request.php(279)\n#0 \/plugins\/API\/Controller.php(41) Ideally will add a test but probably won't find the time soon. * Add failing test. * Fix test. Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>
sgiehl
force-pushed
the
merge3x
branch
2 times, most recently
from
February 20, 2020 14:16
b5254c4
to
8b0125b
Compare
* Try to prevent possible deadlock in archive invalidator * use one query to delete all at once
* Add UI test for JavaScript tracking. * apply some review feedback * try to fix UI test on travis * Add missing screenshot. * Normalize JSTracker UI test result. * update screenshot
* Fix VisitorFrequency.get API for idsites=all * fix console test * updates some UI files * fix console test
…ble (#15592) * Try to determine the region iso code based on it's name if not available * Adds test for region without code
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.