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]update market place wording and UI #18527

Merged
merged 22 commits into from Feb 14, 2022
Merged

[UI]update market place wording and UI #18527

merged 22 commits into from Feb 14, 2022

Conversation

peterhashair
Copy link
Contributor

Description:

Fixes : #18479
update market place.

Review

update market place.
3c77eb2 
update market place.
Findus23
Findus23 requested changes Dec 21, 2021
View reviewed changes
plugins/Marketplace/lang/en.json Show resolved Hide resolved
plugins/Marketplace/templates/plugin-list.twig Outdated Show resolved Hide resolved
update language
a10c656 
update language
Findus23
Findus23 requested changes Dec 23, 2021
View reviewed changes
plugins/Marketplace/lang/en.json Outdated Show resolved Hide resolved
Peter Zhang and others added 2 commits December 30, 2021 11:52
@sgiehl
Update plugins/Marketplace/lang/en.json
57d63c4 
Co-authored-by: Stefan Giehl <stefan@matomo.org>
update screenshots
5c0bb2c 
update screenshots
@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 Jan 4, 2022
@github-actions
Copy link
Contributor

This issue is in "needs review" but there has been no activity for 7 days. ping @matomo-org/core-reviewers

@github-actions github-actions bot added the Stale The label used by the Close Stale Issues action label Jan 12, 2022
@peterhashair peterhashair removed the Stale The label used by the Close Stale Issues action label Jan 12, 2022
sgiehl
sgiehl requested changes Jan 13, 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. Besides that it should be good to merge. Not sure if @tsteur wants to have a last quick look if everything matches the requirements.

plugins/Installation/templates/finished.twig Show resolved Hide resolved
tsteur
tsteur requested changes Jan 13, 2022
View reviewed changes
Copy link
Member

@tsteur tsteur left a comment

Choose a reason for hiding this comment

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

Tested it all:

  • I think there's a typo it should be free 30 day trial or let's better use free 30-day trial?
    image

  • I'm not seeing the bundles that should be shown?
    image

Peter added 2 commits January 14, 2022 11:36
update wording and array
764d01b 
update wording and array
Update getPremiumFeatures.twig
9f29c64 
remove red color
@peterhashair
Copy link
Contributor Author

@tsteur updated, do I change Special Offer to normal color and font?

@tsteur
Copy link
Member

tsteur commented Jan 13, 2022

image

yes, normal font and color 👍

@peterhashair peterhashair added this to the 4.8.0 milestone Jan 18, 2022
@github-actions
Copy link
Contributor

This issue is in "needs review" but there has been no activity for 7 days. ping @matomo-org/core-reviewers

@github-actions github-actions bot added the Stale The label used by the Close Stale Issues action label Jan 25, 2022
@peterhashair peterhashair removed the Stale The label used by the Close Stale Issues action label Jan 25, 2022
Merge branch '4.x-dev' into m-18479-marketplace-update
c616227 
# Conflicts:
#	plugins/Installation/lang/en.json
#	plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png
@github-actions
Copy link
Contributor

github-actions bot commented Feb 2, 2022

This issue is in "needs review" but there has been no activity for 7 days. ping @matomo-org/core-reviewers

@github-actions github-actions bot added the Stale The label used by the Close Stale Issues action label Feb 2, 2022
@peterhashair peterhashair removed the Stale The label used by the Close Stale Issues action label Feb 2, 2022
@peterhashair
Copy link
Contributor Author

@tsteur updated that one 😀

tsteur
tsteur requested changes Feb 4, 2022
View reviewed changes
Copy link
Member

@tsteur tsteur left a comment

Choose a reason for hiding this comment

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

@peterhashair I just opened the marketplace widget and it's not showing the Special offer: in the bundles (this doesn't come from the API we should simply always prepend it to the text for bundles)
image

In the premium feature widget, can we link the word "free 30-day trial" to https://shop.matomo.org/free-trial/ ?
image

I think it looks good otherwise.

plugins/Installation/Controller.php Outdated Show resolved Hide resolved
Peter and others added 2 commits February 4, 2022 17:02
@peterhashair peterhashair changed the title update market place wording and UI [UI]update market place wording and UI Feb 8, 2022
@tsteur
Copy link
Member

tsteur commented Feb 10, 2022

Looks good from my perspective. The Pull Request tests seems to have had some issues but seems the branch test worked

@peterhashair
Copy link
Contributor Author

@tsteur seems like a submodule error, it appears quite a few times in different PR. Any idea how this happened?

@tsteur
Copy link
Member

tsteur commented Feb 10, 2022

@peterhashair no idea how this happened. I believe I've seen it few times before and when merging things were still fine but not 100% sure. Maybe someone else knows?

Peter and others added 7 commits February 10, 2022 16:31
Update UserPermissionsEdit.vue
37124f4 
update tests error
@peterhashair
built vue files
6a2292e
Update UserPermissionsEdit.vue
ffb0281 
p to br
@peterhashair
built vue files
97d5b67
Update UserPermissionsEdit.vue
0e38034 
revert change
Merge branch '4.x-dev' into m-18479-marketplace-update
567b861 
# Conflicts:
#	plugins/UsersManager/vue/dist/UsersManager.umd.js
#	plugins/UsersManager/vue/dist/UsersManager.umd.min.js
Merge branch '4.x-dev' into m-18479-marketplace-update
8b132f3
@peterhashair
Copy link
Contributor Author

@tsteur can I merge this?

@tsteur
Copy link
Member

tsteur commented Feb 14, 2022

If the tests are all good then 👍

@peterhashair peterhashair merged commit f6b343d into 4.x-dev Feb 14, 2022
@peterhashair peterhashair deleted the m-18479-marketplace-update branch February 14, 2022 00:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sgiehl sgiehl sgiehl requested changes

@Findus23 Findus23 Findus23 requested changes

@tsteur tsteur Awaiting requested review from tsteur

Assignees
No one assigned
Labels
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.
Projects
None yet
Milestone
4.8.0
Development

Successfully merging this pull request may close these issues.

Minor marketplace tweaks to mention premium features free trial
4 participants
@peterhashair @tsteur @sgiehl @Findus23