diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2016-08-31 16:13:54 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2016-08-31 16:13:54 +0300 |
| commit | 4617d4205cdf646a52ef1886d9240e9c2bad0609 (patch) | |
| tree | 849ee39219166830170513e6b00161d3e5864514 /plugins/Annotations | |
| parent | 903b870466b62e8a655a0f6564d052583c0fb7ec (diff) | |
| parent | 5d52b777100f5acb82d16e947e0e9ab2c0804215 (diff) | |
Merge branch '3.x-dev' into 3.0-m06
Conflicts:
js/piwik.min.js
piwik.js
Diffstat (limited to 'plugins/Annotations')
| -rwxr-xr-x | plugins/Annotations/javascripts/annotations.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/Annotations/javascripts/annotations.js b/plugins/Annotations/javascripts/annotations.js index f699b3aec9..b6d08e9856 100755 --- a/plugins/Annotations/javascripts/annotations.js +++ b/plugins/Annotations/javascripts/annotations.js @@ -17,7 +17,8 @@ action: 'getAnnotationManager', idSite: idSite, date: date, - period: period + period: period, + filter_limit: '-1' }; if (lastN) { ajaxParams.lastN = lastN; @@ -102,7 +103,8 @@ action: 'getEvolutionIcons', idSite: idSite, date: date, - period: period + period: period, + filter_limit: '-1' }; if (lastN) { ajaxParams.lastN = lastN; |