From f2a93e2583f282d7a080c837e0469b4e1468a066 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 12 May 2016 22:34:26 +0200 Subject: misc: Fix typos (found by codespell) (#10136) Signed-off-by: Stefan Weil --- misc/internal-docs/content-tracking.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'misc') diff --git a/misc/internal-docs/content-tracking.md b/misc/internal-docs/content-tracking.md index 7b854a3d53..903ed32c8c 100644 --- a/misc/internal-docs/content-tracking.md +++ b/misc/internal-docs/content-tracking.md @@ -9,7 +9,7 @@ This is the technical concept for implementing content tracking. We won't plan a | ------------- | ------------- | | Plugin name | Contents | | Content block | Is a container which consists of a content name, piece, target and an interaction. | -| Content name | A name that represents a content block. The name will be visible in reports. One name can belong to differnt content pieces. | +| Content name | A name that represents a content block. The name will be visible in reports. One name can belong to different content pieces. | | Content piece | This is the actual content that was displayed, eg a path to a video/image/audio file, a text, ... | | Content target | For instance the URL of a landing page where the user was led to after interacting with the content block. | | Content impression | Any content block that was displayed on a page, such as a banner or an ad. Optionally you can tell Piwik to track only impressions for content blocks that were actually visible. | @@ -494,7 +494,7 @@ There would be two reports: Nested content makes sense (users will do this). How would it work when several contents are nested? Note: we don't need to handle this case in MVP but maybe worth thinking about it. -6. FYI: We would probably also need an attribute like data-target="$target" and/or the possiblity for data-trackclick="$target" since not all links might be defined via href but onclick javascript links. See next section +6. FYI: We would probably also need an attribute like data-target="$target" and/or the possibility for data-trackclick="$target" since not all links might be defined via href but onclick javascript links. See next section +1 @@ -520,7 +520,7 @@ Yes. Sounds good: this would make Contents plugin more generic. - * We'd probably have to offer a mode to rescan all banners again at a certain time and only track those content pieces now that were not visibile before but are now + * We'd probably have to offer a mode to rescan all banners again at a certain time and only track those content pieces now that were not visible before but are now In ticket I wrote `function trackContentPieces() that will let users re-scan the page for Content pieces when DOM has changed.` but maybe instead the function should be called `rescanPageForContents` ? @@ -535,7 +535,7 @@ so +1 I think that should be the default mode, ie. on page load we detect impressions, and then we also attach to events like scrolling to check ie. every 500ms whether a given Contents is visible. Would that be work? 10. FYI: "you may add a CSS class or attribute to the link element to track" => It could be also a span, a div or something else -11. FYI: There is way to much magic how content-name is found and it is neither predicatble nor understandable by users, I will simplify this and rather require users to set specific attributes! See next section +11. FYI: There is way to much magic how content-name is found and it is neither predictable nor understandable by users, I will simplify this and rather require users to set specific attributes! See next section OK -- cgit v1.2.3 From f71d46b649edcb81d681c488463674993420387e Mon Sep 17 00:00:00 2001 From: Matthieu Aubry Date: Wed, 29 Jun 2016 20:06:27 +1200 Subject: Update jquery to latest 1.*, new release checklist test --- misc/others/iframeWidget.htm | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 misc/others/iframeWidget.htm (limited to 'misc') diff --git a/misc/others/iframeWidget.htm b/misc/others/iframeWidget.htm deleted file mode 100644 index 9b7c4261f1..0000000000 --- a/misc/others/iframeWidget.htm +++ /dev/null @@ -1,13 +0,0 @@ - - - -

Embedding the Piwik Country widget in an Iframe

- -
- -
- - - -- cgit v1.2.3 From 6eef4c857a09d4d16d5827e77d1511af6fd61fb6 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Sun, 3 Jul 2016 21:18:47 +0200 Subject: submodule update --- misc/log-analytics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'misc') diff --git a/misc/log-analytics b/misc/log-analytics index 6fd24921b3..d9b4d68d5f 160000 --- a/misc/log-analytics +++ b/misc/log-analytics @@ -1 +1 @@ -Subproject commit 6fd24921b3e9ce4b46861ae12528ad91e85583b3 +Subproject commit d9b4d68d5f08c0db5c80e942a63d19ffd9d16f3c -- cgit v1.2.3 From fcea45140745d8218b78001490ddf0fa755e6467 Mon Sep 17 00:00:00 2001 From: Matthieu Aubry Date: Tue, 12 Jul 2016 20:39:19 +1200 Subject: Reset the list of items in the cart, after tracking an ecommerce conversion (#10279) * Clarify that token_auth must be an admin or super user token. * Reset the list of items in the cart, after tracking an ecommerce conversion But do not reset the list of itms in the cart after tracking an ecommerce cart update. fixes #10252 * Adding changelog note `piwik.js`: after an ecommerce order is tracked using `trackEcommerceOrder`, the items in the cart will now be removed from the JavaScript object. Calling `trackEcommerceCartUpdate` will not remove the items in the cart. --- misc/log-analytics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'misc') diff --git a/misc/log-analytics b/misc/log-analytics index d9b4d68d5f..ca215c2b85 160000 --- a/misc/log-analytics +++ b/misc/log-analytics @@ -1 +1 @@ -Subproject commit d9b4d68d5f08c0db5c80e942a63d19ffd9d16f3c +Subproject commit ca215c2b850c5429f6a62b96777b5f0367065062 -- cgit v1.2.3 From e4cefc4496a272b158436e7dfe15fb2c70de09ce Mon Sep 17 00:00:00 2001 From: sgiehl Date: Sat, 16 Jul 2016 10:06:10 +0200 Subject: submodule updates --- misc/log-analytics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'misc') diff --git a/misc/log-analytics b/misc/log-analytics index ca215c2b85..3553c4023e 160000 --- a/misc/log-analytics +++ b/misc/log-analytics @@ -1 +1 @@ -Subproject commit ca215c2b850c5429f6a62b96777b5f0367065062 +Subproject commit 3553c4023eefa4b21b35ec42e1e9df7158f92a00 -- cgit v1.2.3 From e43c9717b14a7c79c7ff89b05c452af6c822e40f Mon Sep 17 00:00:00 2001 From: sgiehl Date: Fri, 19 Aug 2016 21:34:03 +0200 Subject: submodule updates --- misc/log-analytics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'misc') diff --git a/misc/log-analytics b/misc/log-analytics index 3553c4023e..2878508f66 160000 --- a/misc/log-analytics +++ b/misc/log-analytics @@ -1 +1 @@ -Subproject commit 3553c4023eefa4b21b35ec42e1e9df7158f92a00 +Subproject commit 2878508f66c10d998c9e4e0bc276988b3755cde1 -- cgit v1.2.3 From 4b395d2385e0041973349c7575fc10378b85558e Mon Sep 17 00:00:00 2001 From: mattab Date: Mon, 29 Aug 2016 11:52:15 +1200 Subject: Fix issue when running archiving via the old archive.php path Notice: Use of undefined constant PIWIK_DOCUMENT_ROOT - assumed 'PIWIK_DOCUMENT_ROOT' in plugins/CustomPiwikJs/Commands/UpdateTracker.php --- misc/cron/archive.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'misc') diff --git a/misc/cron/archive.php b/misc/cron/archive.php index 0bc4daa1f1..e95e01ea8d 100644 --- a/misc/cron/archive.php +++ b/misc/cron/archive.php @@ -9,8 +9,12 @@ * @package Piwik */ +if (!defined('PIWIK_DOCUMENT_ROOT')) { + define('PIWIK_DOCUMENT_ROOT', realpath(dirname(__FILE__) . "/../..")); +} + if (!defined('PIWIK_INCLUDE_PATH')) { - define('PIWIK_INCLUDE_PATH', realpath(dirname(__FILE__) . "/../..")); + define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT); } if (!defined('PIWIK_USER_PATH')) { -- cgit v1.2.3