Skip to content

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

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.

Sign up for GitHub

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

Jump to bottom
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 January 13, 2020 17:56
@sgiehl
Updates search engine and social definitions (#15384)
e883e27
@sgiehl
updates device detector to latest release (#15388)
971e53f 
* updates device detector to latest release

* updates tests
@sgiehl
translation update (#15389)
e179798
@mattab @tsteur @diosmosis
Fix Could not get the lock for ID, when creating a site (#15401)
f284ec7 
* Lock key start

* do not empty key lock

Co-authored-by: Thomas Steur <tsteur@users.noreply.github.com>
@mattab
3.13.1
78c97a6
@sgiehl
submodule updates
cc5b45e
@sgiehl @tsteur
Use correct name in update available message (#15423)
8d15ea3
@sgiehl @tsteur
Fix removing user capabilities (#15422)
6caecb3
@PeterUpfold @sgiehl
Order of implode() args, avoid E_NOTICE in PHP7.4 (#15428)
a85f344
@sgiehl @tsteur
Fixes possible php warning in visitor log (#15442)
3204301
@diosmosis
silence is_executable call (#15446)
b2a24e3
@diosmosis @tsteur
Make sure geolocation admin experience is consistent if user is not u…
fc4437c 
…sing GeoIp2 plugin. (#15447)
@diosmosis @tsteur
Fix referrers test. (#15448)
5cdecb0
@sgiehl @tsteur
Ensure to close visitor popover correctly (#15443)
5322d05
@sgiehl @tsteur
Fixes possible warning (#15453)
74414c9
@diosmosis
Forward instance_id from local config when reseting config during tes…
d6d7935 
…ts. (#15445)
@diosmosis
Add event that allows plugins to disable archiving for certain period…
804237d 
…s/sites if they want. (#15457)

* Add event that allows plugins to disable archiving for certain periods/sites if they want.

* apply review feedback
@sgiehl @tsteur
Fix possible warning for columns without index (#15467)
1dd8fb9
@diosmosis @tsteur
Day range archiving issue (#15462)
02c0286
@tsteur @diosmosis
Improve lock ID check for max length (#15407)
bc2631c 
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
@tsteur
Use SameSite none for session token when embedded into iframe (#15439)
162513d
@tsteur
Make sure tracking works in IE9 and lower (#15480)
daf1968
@tsteur
Mention Joomla install FAQ (#15481)
20d638a
@mattab
Make sparklines work when mbstring extension is not installed (#15489)
ab047ab 
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
@diosmosis
update screenshots (#15488)
f23b6e3
@mattab
3.13.2-rc1
591cc9d
@diosmosis
Use safemode when running CLI commands (#15472)
82c8b93
@Findus23
update icons submodule (#15490)
4dc777f 
* update icons submodule

* update UI tests
@sgiehl
Fix possible undefined index notice (#15502)
ce896ba
@sgiehl
Use latest davaxi/sparkline release (#15464)
a49bad2
@sgiehl sgiehl added not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Needs Review PRs that need a code review labels Feb 10, 2020
@sgiehl sgiehl added this to the 4.0.0 milestone Feb 10, 2020
@tsteur
Copy link
Member

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 Compare February 11, 2020 07:25
@sgiehl
Copy link
Member Author

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
@sgiehl sgiehl deleted the merge3x branch February 11, 2020 08:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Milestone
4.0.0
Development

Successfully merging this pull request may close these issues.
6 participants
@sgiehl @tsteur @mattab @PeterUpfold @diosmosis @Findus23