diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2020-04-16 23:24:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 23:24:39 +0300 |
| commit | 37182bfda5529ddb4ba2aaedd09beb1e5ae94fbb (patch) | |
| tree | f6609b714e4e6cac35769f98e8f47f5e95071b5f /plugins/Contents | |
| parent | e943702e1e54bfc71d423bfd2ec2a48c0a4610f7 (diff) | |
merge 3.x to 4.x (#15821)
* Avoid possible error subtable already exists but not loaded (#15779)
* Make sure to always set JSON_PIWIK to native JSON when possible (#15785)
* make sure to always set JSON_PIWIK to native JSON when possible
* rebuilt piwik.js
* Force POST for bulk requests, fix alwaysUseSendBeacon not respected for bulk requests (#15784)
* Force POST for bulk requests, fix alwaysUseSendBeacon not respected for bulk requests
* rebuilt piwik.js
* Make sure to clean up tracking failures before sending email notification (#15798)
Feedback from a customer... Eg the daily `cleanupTrackingFailures()` action might be only executed after the weekly `notifyTrackingFailures` therefore we should try to clean up failures first and then check if any are left. Avoids the case where a user opens hours later the email they receive and then there are no tracking failures reported. This could still happen but it's a bit less likely.
* 3.13.5-b1
* Faster segmented suggested values when browser archiving is disabled (#15786)
* Faster segmented suggested values when browser archiving is disabled
* make sure no segment is set
* remove wrong var type
* fix/add tests
* add more segment values
* detect if we should flatten or not
* add docs
* Fix problem when comparing segments or opening popovers (#15809)
refs #15805
* purge all old archives regardless of done value (#15800)
* purge all old archives regardless of done value, we only care about the newest usable one
* Fix test and start on new one.
* Add coverage for change in tests.
* there is no longer an inner join so should not need the idsite check
* Add more parameters to the computeNbUnique event (#15808)
* 3.13.5-b2
* One click update in two parts so new code is loaded for second. (#15770)
* One click update in two parts so new code is loaded for second.
* remove no longer needed code
Co-authored-by: Thomas Steur <tsteur@users.noreply.github.com>
Co-authored-by: Matthieu Aubry <mattab@users.noreply.github.com>
Co-authored-by: Stefan Giehl <stefan@matomo.org>
Diffstat (limited to 'plugins/Contents')
| -rw-r--r-- | plugins/Contents/Columns/ContentName.php | 1 | ||||
| -rw-r--r-- | plugins/Contents/Columns/ContentPiece.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/plugins/Contents/Columns/ContentName.php b/plugins/Contents/Columns/ContentName.php index b327918a77..a56b49f835 100644 --- a/plugins/Contents/Columns/ContentName.php +++ b/plugins/Contents/Columns/ContentName.php @@ -24,6 +24,7 @@ class ContentName extends ActionDimension protected $nameSingular = 'Contents_ContentName'; protected $namePlural = 'Contents_ContentNames'; protected $acceptValues = 'The name of a content block, for instance "Ad Sale"'; + protected $suggestedValuesApi = 'Contents.getContentNames'; protected $type = self::TYPE_TEXT; protected $category = 'General_Actions'; protected $sqlFilter = '\\Piwik\\Tracker\\TableLogAction::getIdActionFromSegment'; diff --git a/plugins/Contents/Columns/ContentPiece.php b/plugins/Contents/Columns/ContentPiece.php index 35ac1df8cc..c1d5d3d444 100644 --- a/plugins/Contents/Columns/ContentPiece.php +++ b/plugins/Contents/Columns/ContentPiece.php @@ -23,6 +23,7 @@ class ContentPiece extends ActionDimension protected $nameSingular = 'Contents_ContentPiece'; protected $namePlural = 'Contents_ContentPieces'; protected $acceptValues = 'The actual content. For instance "ad.jpg" or "My text ad"'; + protected $suggestedValuesApi = 'Contents.getContentPieces'; protected $type = self::TYPE_TEXT; protected $category = 'General_Actions'; protected $sqlFilter = '\\Piwik\\Tracker\\TableLogAction::getIdActionFromSegment'; |