Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[UI] Add SPA/PWA to tracking code section #18827

Merged
merged 13 commits into from Mar 1, 2022
Merged

[UI] Add SPA/PWA to tracking code section #18827

merged 13 commits into from Mar 1, 2022

Conversation

peterhashair
Copy link
Contributor

@peterhashair peterhashair commented Feb 20, 2022 •
edited

Description:

Fixes: #18066

Docs update: matomo-org/developer-documentation#614

Add SPA/PWA to the tracking code section and email. Maybe the wording needs to change.

image

image

Review

@peterhashair peterhashair added this to the 4.8.0 milestone Feb 20, 2022
sgiehl
sgiehl requested changes Feb 21, 2022
View reviewed changes
Copy link
Member

@sgiehl sgiehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As mentioned in the issue, we could also add that to the installation page which uses:

matomo/plugins/SitesManager/templates/_displayJavascriptCode.twig

Lines 30 to 36 in 64bcf78

<p>{{ 'SitesManager_LogAnalyticsDescription'|translate('<a href="https://matomo.org/log-analytics/" rel="noreferrer noopener" target="_blank">', '</a>')|raw }}</p>
<h3>{{ 'SitesManager_MobileAppsAndSDKs'|translate }}</h3>
<p>{{ 'SitesManager_MobileAppsAndSDKsDescription'|translate('<a href="https://matomo.org/integrate/#programming-language-platforms-and-frameworks" rel="noreferrer noopener" target="_blank">','</a>')|raw }}</p>
<h3>{{ 'CoreAdminHome_HttpTrackingApi'|translate }}</h3>

plugins/CoreAdminHome/lang/en.json Outdated Show resolved Hide resolved
plugins/CoreAdminHome/lang/en.json Outdated Show resolved Hide resolved
Peter Zhang and others added 2 commits February 22, 2022 01:40
@sgiehl
Update plugins/CoreAdminHome/lang/en.json
b43f047 
Co-authored-by: Stefan Giehl <stefan@matomo.org>
remove duplicates and add a short title
4353c62 
remove duplicates and add a short title
Peter added 2 commits February 24, 2022 12:32
@peterhashair peterhashair added Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. labels Feb 28, 2022
sgiehl
sgiehl requested changes Feb 28, 2022
View reviewed changes
Copy link
Member

@sgiehl sgiehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left a minor comment. Otherwise guess this looks good. Not sure if maybe @justinvelluppillai could have a quick look at the English wording.

plugins/CoreAdminHome/templates/trackingCodeGenerator.twig Outdated Show resolved Hide resolved
@sgiehl
Update plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
9b35cf0 
Co-authored-by: Stefan Giehl <stefan@matomo.org>
justinvelluppillai
justinvelluppillai suggested changes Mar 1, 2022
View reviewed changes
Copy link
Contributor

@justinvelluppillai justinvelluppillai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have checked the language, mostly looks good but I have suggested one change.

Peter Zhang and others added 2 commits March 1, 2022 13:35
@justinvelluppillai
Update plugins/CoreAdminHome/lang/en.json
6a67968 
Co-authored-by: Justin Velluppillai <justin@innocraft.com>
Update UIIntegrationTest_admin_manage_tracking_code.png
6538cf1 
update screenshots
@justinvelluppillai justinvelluppillai modified the milestones: 4.8.0, 4.9.0 Mar 1, 2022
sgiehl
sgiehl approved these changes Mar 1, 2022
View reviewed changes
Copy link
Member

@sgiehl sgiehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

guess this one should then be good to merge.

@sgiehl sgiehl removed the Needs Review PRs that need a code review label Mar 1, 2022
@peterhashair peterhashair reopened this Mar 1, 2022
@peterhashair peterhashair merged commit 80fbf58 into 4.x-dev Mar 1, 2022
@peterhashair peterhashair deleted the m-18066-spa branch March 1, 2022 21:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinvelluppillai justinvelluppillai justinvelluppillai requested changes

@sgiehl sgiehl sgiehl approved these changes

Assignees
No one assigned
Labels
not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Milestone
4.9.0
3 participants
@peterhashair @justinvelluppillai @sgiehl