https://github.com/matomo-org/matomo/pull/15543 - Mouve

Site d'origine

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 #15543

Merged
merged 43 commits into from Feb 11, 2020
Merged

Merge branch 3.x-dev into 4.x-dev #15543

merged 43 commits into from Feb 11, 2020

Conversation

@sgiehl
Copy link
Member

@sgiehl sgiehl commented Feb 10, 2020

No description provided.

sgiehl and others added 30 commits Jan 13, 2020
* 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>
…ts. (#15445)
…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
sgiehl and others added 9 commits Feb 6, 2020
cherry picking  #15424  to fix #15420 in 3.x-dev
@tsteur
Copy link
Member

@tsteur tsteur commented Feb 10, 2020

👍 be good to fix tests and then merge

@sgiehl sgiehl force-pushed the merge3x branch 5 times, most recently from 0cb3b82 to 4064d06 Feb 10, 2020
@sgiehl sgiehl force-pushed the merge3x branch from 4064d06 to aaaf3cf Feb 11, 2020
@sgiehl
Copy link
Member Author

@sgiehl sgiehl commented Feb 11, 2020

Tests, not failing on 4.x-dev already, are fixed now.

@sgiehl sgiehl merged commit 5d2dab7 into 4.x-dev Feb 11, 2020
0 of 2 checks passed
0 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/travis-ci/push The Travis CI build is in progress
Details
@sgiehl sgiehl deleted the merge3x branch Feb 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants

Raccourcis

Commandes

Fermer