Merge 5.x-dev to staging #200

marcel-innocraft · 2025-12-02T01:59:06Z

Description

PR to update staging with the latest changes from 5.x-dev.

Archiving on demo2 and demo3 sites is currently failing for some sites because external code is referencing classes in this plugin that don't exist yet:

No entry or class found for 'Piwik\Plugins\MarketingCampaignsReporting\SystemSettings' - in plugin CustomReports.
#0 \/core\/ArchiveProcessor\/Loader.php(314): Piwik\ArchiveProcessor\PluginsArchiver-&gt;callAggregateAllPlugins('122389', '122389', false)
#1 \/core\/ArchiveProcessor\/Loader.php(187): Piwik\ArchiveProcessor\Loader-&gt;prepareAllPluginsArchive('122389', '122389')
#2 \/core\/ArchiveProcessor\/Loader.php(166): Piwik\ArchiveProcessor\Loader-&gt;insertArchiveData('118815', '118815', false, NULL)
#3 \/core\/ArchiveProcessor\/Loader.php(106): Piwik\ArchiveProcessor\Loader-&gt;prepareArchiveImpl(false)
#4 \/core\/Context.php(76): Piwik\ArchiveProcessor\Loader-&gt;Piwik\ArchiveProcessor\{closure}()
...

Checklist

[✔] Tested locally or on demo2/demo3?
[NA] New test case added/updated?
[NA] Are all newly added texts included via translation?
[NA] Are text sanitized properly? (Eg use of v-text v/s v-html for vue)
[NA] Version bumped?

Fixed flat report not working for campaign_name and camppaign_source-medium report

Currently translated at 100.0% (19 of 19 strings) Translation: Matomo/Plugin MarketingCampaignsReporting Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-marketingcampaignsreporting/gu/ [ci skip] Translated using Weblate (Gujarati) Currently translated at 73.6% (14 of 19 strings) Translation: Matomo/Plugin MarketingCampaignsReporting Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-marketingcampaignsreporting/gu/ [ci skip] Co-authored-by: Hosted Weblate <hosted@weblate.org> Co-authored-by: Kalpesh Mahida <kalpesh.mahida@gmail.com>

Currently translated at 100.0% (19 of 19 strings) Translation: Matomo/Plugin MarketingCampaignsReporting Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-marketingcampaignsreporting/eu/ [ci skip] Co-authored-by: Asier Iturralde Sarasola <asier.iturralde@aldatsa.eus> Co-authored-by: Hosted Weblate <hosted@weblate.org>

…ampaignsreporting Translations update from Hosted Weblate

Bumped version to 5.0.3 and created CHANGELOG.md

Fixes formatting for v5.0.3

Add plugin category

Bumped version to 5.0.4

Ensure visits are not all tracked at the same time in test fixture

Currently translated at 100.0% (19 of 19 strings) Translation: Matomo/Plugin MarketingCampaignsReporting Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-marketingcampaignsreporting/ga/ [ci skip] Co-authored-by: Aindriú Mac Giolla Eoin <aindriu80@gmail.com>

…ampaignsreporting Translations update from Hosted Weblate

…ease

Currently translated at 100.0% (19 of 19 strings) Translation: Matomo/Plugin MarketingCampaignsReporting Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-marketingcampaignsreporting/cs/ [ci skip] Co-authored-by: Jiří Podhorecký <j.podhorecky@volny.cz>

…ampaignsreporting Translations update from Hosted Weblate

Adds test for PHPCS

This reverts commit 6d9c38c.

This reverts commit 19c742f.

Updated by "Cleanup translation files" hook in Weblate. Translation: Matomo/Plugin MarketingCampaignsReporting Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-marketingcampaignsreporting/ [ci skip] Co-authored-by: Hosted Weblate <hosted@weblate.org>

…ampaignsreporting Translations update from Hosted Weblate

Currently translated at 100.0% (21 of 21 strings) Translation: Matomo/Plugin MarketingCampaignsReporting Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-marketingcampaignsreporting/fr/ [ci skip] Co-authored-by: Ronan Chardonneau <contact@ronan-chardonneau.fr>

* Translated using Weblate (Russian) Currently translated at 76.1% (16 of 21 strings) Translation: Matomo/Plugin MarketingCampaignsReporting Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-marketingcampaignsreporting/ru/ [ci skip] Co-authored-by: Anonymous <noreply@weblate.org> Co-authored-by: Hosted Weblate <hosted@weblate.org> * Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 80.9% (17 of 21 strings) Translation: Matomo/Plugin MarketingCampaignsReporting Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-marketingcampaignsreporting/zh_Hans/ [ci skip] Co-authored-by: Anonymous <noreply@weblate.org> Co-authored-by: Hosted Weblate <hosted@weblate.org>

Co-authored-by: james-hill-matomo <james.hill@innocraft.com>

…urce parameter

Avoid incorrectly forcing new visit when AI Assistants provide utm_source parameter

Fixes fatal error, #198

Update UI screenshots after Profil modal fix, ux-287

snake14 · 2025-12-04T20:44:52Z

I simply deleted the staging branch since it hadn't been used in a while.

michalkleiner and others added 30 commits March 5, 2024 02:23

Add plugin category

5d11a73

Merge pull request #148 from matomo-org/PG-3258-flat-not-working

d4db44c

Fixed flat report not working for campaign_name and camppaign_source-medium report

Merge pull request #141 from weblate/weblate-matomo-plugin-marketingc…

516e0fc

…ampaignsreporting Translations update from Hosted Weblate

Bumped version to 5.0.3 and created CHANGELOG.md

e226635

Merge pull request #149 from matomo-org/bump-version-5.0.3

7a43615

Bumped version to 5.0.3 and created CHANGELOG.md

Fixes formatting

70d781b

Merge pull request #150 from matomo-org/bump-version-5.0.3

fd45e68

Fixes formatting for v5.0.3

Merge pull request #146 from matomo-org/category

f0cb832

Add plugin category

Bumped version to 5.0.4

49ca93b

Merge pull request #151 from matomo-org/bump-version-5.0.4

4bea4b4

Bumped version to 5.0.4

Ensure visits atre not all tracked at the same time

76c92a7

Merge pull request #152 from matomo-org/improvetest

4a30b3c

Ensure visits are not all tracked at the same time in test fixture

Updates expected test files (#155)

4c54ca0

Merge pull request #156 from weblate/weblate-matomo-plugin-marketingc…

acac394

…ampaignsreporting Translations update from Hosted Weblate

updates expected UI tests after icon updates

4f00fb0

Updated the conversion query to force index

46e964a

Adding check for core version to avoid requiring minimum version incr…

05f0ab1

…ease

Switching to checking for core method instead of version

19c742f

Merge pull request #161 from weblate/weblate-matomo-plugin-marketingc…

35efed4

…ampaignsreporting Translations update from Hosted Weblate

Removing unused import statement

6d9c38c

Adds test for PHPCS

972fa33

Fixes PSR test

0397499

Merge pull request #163 from matomo-org/spice-psr

1626319

Adds test for PHPCS

Revert "Removing unused import statement"

ff55722

This reverts commit 6d9c38c.

Revert "Switching to checking for core method instead of version"

696b8e9

This reverts commit 19c742f.

Increasing Matomo version

ea75dd6

weblate and others added 27 commits October 14, 2025 11:53

Merge pull request #190 from weblate/weblate-matomo-plugin-marketingc…

d74326d

…ampaignsreporting Translations update from Hosted Weblate

PG-4669 test with matomo5_[max|min]_php [ignore_release] (#194)

45deda1

Co-authored-by: james-hill-matomo <james.hill@innocraft.com>

Updates expected test files after core changes (#193)

5e83c02

Avoid incorrectly forcing new visit when AI Assistants provide utm_so…

a6b28c1

…urce parameter

bump version

b523cb9

Merge pull request #196 from matomo-org/dev-19639

71bab3d

Avoid incorrectly forcing new visit when AI Assistants provide utm_source parameter

Fixes fatal error, #198

7cfe4eb

Fixes changelog

8f7daa8

Merge pull request #199 from matomo-org/198-fix-regression

f68dd92

Fixes fatal error, #198

Update UI screenshots after Profil modal fix

5e23731

Merge pull request #197 from matomo-org/ux-287

48f8865

Update UI screenshots after Profil modal fix, ux-287

snake14 deleted the branch staging December 4, 2025 20:13

snake14 closed this Dec 4, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 5.x-dev to staging #200

Merge 5.x-dev to staging #200

Uh oh!

marcel-innocraft commented Dec 2, 2025

Uh oh!

snake14 commented Dec 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Merge 5.x-dev to staging #200

Merge 5.x-dev to staging #200

Uh oh!

Conversation

marcel-innocraft commented Dec 2, 2025

Description

Checklist

Uh oh!

snake14 commented Dec 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants