Skip to content
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 4.x-dev into master #16821

Merged
merged 906 commits into from Nov 27, 2020
Merged

Merge 4.x-dev into master #16821

merged 906 commits into from Nov 27, 2020

Conversation

mattab
Copy link
Member

@mattab mattab commented Nov 27, 2020

This is one of the steps in #14601

tsteur and others added 30 commits September 2, 2020 00:02
* Provide more debug information in system check

* hide some info in screenshots

* try overriding some columns

* hide tr instead of only the content

* trying to get tests to work

* try different way

* try fix tests

* make sure cookie exists

* add overridejs to install

* more tweaks

* fix test

* more tweaks

* move things to DI

* minor tweaks

* minor tweaks

* fix test

* also anonymise DB username

* Update Twig.php

* Improve query performance

* Fix ClientTest keywords

Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>
…6364)

* Fix Custom opt out screen should not imply tracking consent given

fix #16362

As explained in the issue.

When `optUserOut` is called, it should set the `mtm_consent_removed` cookie.

When calling `forgetUserOptOut` then it should only undo the previous action and remove the `mtm_consent_removed` cookie. It should not set a `consent given` cookie because the user did likely not really give proper tracking consent (they would then instead implement https://developer.matomo.org/guides/tracking-consent ).

Noticed this while implementing a custom opt out screen for Matomo for WordPress

* rebuilt piwik.js
* Make sure query will use index

* less code

* use method

* update test
Depending of the time of the day it returns 0 or 1. There might be better ways to fix this but thought to keep it simple. Happy to change if needed.

https://builds-artifacts.matomo.org/matomo-org/matomo/4.x-dev/42269/Diagnostics_page.png
* System check: Add Matomo Version History and download feature

* minor tweak

* update screenshots

* update screenshot

Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>
Co-authored-by: tsteur <tsteur@users.noreply.github.com>
$aParameters['filter_pattern_recursive'] was already assigned on line 276.
* Remove visit standard length from tracker

* adjust changelog

* rebuilt piwik.js
* Update donations widget

* fix some tests

* fix some tests

* update css

* fix test

* improve wording

* fix tests
* Better describe the brute force IP list

* fix ui test
* Add methods to remove invalidations.

* Add check if site exists to beginning of queue consumers loop to find archive data

* Delete invalidations w/ no site in task and for site when deleting.

* fix test

* fix test

* another test fix
tsteur and others added 28 commits November 19, 2020 09:09
* Prevent some archiving notes being printed for each site

* no longer call init
Co-authored-by: tsteur <tsteur@users.noreply.github.com>
* Fix Installer UI tests

* login after update no longer required

* updates expected screenshots
> WARNING: plugins/SEO/Metric/Alexa.php(52): Notice - Undefined variable: value - Matomo 4.0.0 - Please report this message in the Matomo forums: https://forum.matomo.org (please do a search first as it might have been reported already) (Module: SEO, Action: getRank, In CLI mode: false)

Was getting above error. Probably because of:

> WARNING: Error while getting Alexa SEO stats via fallback method: curl_exec: Resolving timed out after 10069 milliseconds. Hostname requested was: www.alexa.com (Module: SEO, Action: getRank, In CLI mode: false)
* Add pluginjson for custom dimensions

fix #16786

* fix build
* Remove ExampleTheme plugin on update

We already deactivate the plugin but it looks like we actually need to fully remove the plugin. It should only be removed if it was not installed through git as in git we still have it.

* Update Version.php
#16796)

* Invalidate everything once before a site is archived and do not invalidate again until a core:archive run sees that site.

* remove no longer needed code

* do not invalidate if there is already an invalidation for the site from today

* remove ts_invalidated check + another query tweak

* fix test

* fix another test
@mattab mattab merged commit d9fd498 into master Nov 27, 2020
@mattab mattab added the not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. label Nov 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants