diff options
| author | Stefan Giehl <stefan@matomo.org> | 2020-02-11 11:38:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 11:38:47 +0300 |
| commit | 5d2dab75e3654126ed95ea72b58b4c225ac59492 (patch) | |
| tree | 7886dcc7c8593906fbebbca49c7946405bcfa2cc /composer.lock | |
| parent | ab1e70016dde3ef93498bca99d0aa8b38e6d7f38 (diff) | |
Merge branch 3.x-dev into 4.x-dev (#15543)
* Updates search engine and social definitions (#15384)
* updates device detector to latest release (#15388)
* updates device detector to latest release
* updates tests
* translation update (#15389)
* Fix Could not get the lock for ID, when creating a site (#15401)
* Lock key start
* do not empty key lock
Co-authored-by: Thomas Steur <tsteur@users.noreply.github.com>
* 3.13.1
* submodule updates
* Use correct name in update available message (#15423)
* Fix removing user capabilities (#15422)
* Order of implode() args, avoid E_NOTICE in PHP7.4 (#15428)
* Fixes possible php warning in visitor log (#15442)
* silence is_executable call (#15446)
* Make sure geolocation admin experience is consistent if user is not using GeoIp2 plugin. (#15447)
* Fix referrers test. (#15448)
* Ensure to close visitor popover correctly (#15443)
* Fixes possible warning (#15453)
* Forward instance_id from local config when reseting config during tests. (#15445)
* Add event that allows plugins to disable archiving for certain periods/sites if they want. (#15457)
* Add event that allows plugins to disable archiving for certain periods/sites if they want.
* apply review feedback
* Fix possible warning for columns without index (#15467)
* Day range archiving issue (#15462)
* Improve lock ID check for max length (#15407)
Better patch for https://github.com/matomo-org/matomo/pull/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
* Use SameSite none for session token when embedded into iframe (#15439)
* Make sure tracking works in IE9 and lower (#15480)
* Mention Joomla install FAQ (#15481)
* Make sparklines work when mbstring extension is not installed (#15489)
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 screenshots (#15488)
* 3.13.2-rc1
* Use safemode when running CLI commands (#15472)
* update icons submodule (#15490)
* update icons submodule
* update UI tests
* Fix possible undefined index notice (#15502)
* Use latest davaxi/sparkline release (#15464)
* translation update
* submodule updates
* Fix deprecation notice (#15530)
see https://github.com/matomo-org/matomo/pull/15467#issuecomment-583283444
* 3.13.2-rc2
* update cache component (#15536)
* fixes copy dashboard to user for more than 100 users (#15538)
cherry picking #15424 to fix #15420 in 3.x-dev
* Add missing return statement. (#15539)
* 3.13.2
* update tests
* update tests
Co-authored-by: Matthieu Aubry <mattab@users.noreply.github.com>
Co-authored-by: Thomas Steur <tsteur@users.noreply.github.com>
Co-authored-by: Peter Upfold <pgithub@upfold.org.uk>
Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>
Co-authored-by: Lukas Winkler <github@lw1.at>
Diffstat (limited to 'composer.lock')
| -rw-r--r-- | composer.lock | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/composer.lock b/composer.lock index 41cefe7cda..8e53fec2d2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6436d84b7a1cbf44a996b4795723ce68", + "content-hash": "ef319f0bec0c7988dd83727e05ac2b39", "packages": [ { "name": "composer/ca-bundle", @@ -626,16 +626,16 @@ }, { "name": "matomo/searchengine-and-social-list", - "version": "1.4.4", + "version": "3.11.0", "source": { "type": "git", "url": "https://github.com/matomo-org/searchengine-and-social-list.git", - "reference": "5c29a58c6cab8a78c3e625ffc615e759ef8466d3" + "reference": "80ab98ed17ea5b72730f4f4d96acc03847440103" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matomo-org/searchengine-and-social-list/zipball/5c29a58c6cab8a78c3e625ffc615e759ef8466d3", - "reference": "5c29a58c6cab8a78c3e625ffc615e759ef8466d3", + "url": "https://api.github.com/repos/matomo-org/searchengine-and-social-list/zipball/80ab98ed17ea5b72730f4f4d96acc03847440103", + "reference": "80ab98ed17ea5b72730f4f4d96acc03847440103", "shasum": "" }, "replace": { @@ -647,7 +647,7 @@ "CC0-1.0" ], "description": "Search engine and social network definitions used by Matomo (formerly Piwik)", - "time": "2018-05-25T11:09:26+00:00" + "time": "2020-01-13T09:01:25+00:00" }, { "name": "maxmind-db/reader", @@ -1236,16 +1236,16 @@ }, { "name": "piwik/device-detector", - "version": "3.12.2", + "version": "3.12.3", "source": { "type": "git", "url": "https://github.com/matomo-org/device-detector.git", - "reference": "c352144e2ab1aff81e659aa38224be987b87855b" + "reference": "22257883bd2c7c21d68112a907cdad7de4a2ba31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/c352144e2ab1aff81e659aa38224be987b87855b", - "reference": "c352144e2ab1aff81e659aa38224be987b87855b", + "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/22257883bd2c7c21d68112a907cdad7de4a2ba31", + "reference": "22257883bd2c7c21d68112a907cdad7de4a2ba31", "shasum": "" }, "require": { @@ -1287,7 +1287,7 @@ "parser", "useragent" ], - "time": "2019-12-22T21:23:31+00:00" + "time": "2020-01-13T16:15:20+00:00" }, { "name": "psr/container", |