7379 people voted #7541
Merged
7379 people voted #7541
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…mozilla says and researched section.
* New localization approach for Mozilla researched * Remove extra spaces and simplify string
* New localization approach for People voted * remove extra spaces * Simplify string * Update most_voted_rating.html
danielfmiranda
temporarily deployed
to
foundation-s-7379-peopl-7dha3w
danielfmiranda
temporarily deployed
to
foundation-s-7379-peopl-7dha3w
danielfmiranda
changed the base branch from
pni-q3-2021
to
7377-mozilla-researched
danielfmiranda
temporarily deployed
to
foundation-s-7379-peopl-7dha3w
danielfmiranda
temporarily deployed
to
foundation-s-7379-peopl-7dha3w
added 2 commits
October 4, 2021 18:29
…illa.org into 7379-people-voted
danielfmiranda
temporarily deployed
to
foundation-s-7379-peopl-7dha3w
Pomax
suggested changes
Oct 5, 2021
network-api/networkapi/wagtailpages/templates/fragments/most_voted_rating.html
Outdated
Show resolved
Hide resolved
danielfmiranda
temporarily deployed
to
foundation-s-7379-peopl-7dha3w
danielfmiranda
temporarily deployed
to
foundation-s-7379-peopl-7dha3w
TheoChevalier
requested changes
Oct 6, 2021
network-api/networkapi/wagtailpages/templates/fragments/most_voted_rating.html
Outdated
Show resolved
Hide resolved
…oted_rating.html Co-authored-by: Théo Chevalier <[email protected]>
danielfmiranda
temporarily deployed
to
foundation-s-7379-peopl-7dha3w
|
Hi @TheoChevalier, thanks for the feedback regarding the colon after the people voted string. I have added your suggestion and re-requested review! |
TheoChevalier
approved these changes
Oct 6, 2021
|
@danielfmiranda it looks like there are some merge conflicts, could you fix these so that CI can make doubly-sure we're all good? =) |
Pomax
suggested changes
Oct 7, 2021
danielfmiranda
temporarily deployed
to
foundation-s-7379-peopl-7dha3w
danielfmiranda
temporarily deployed
to
foundation-s-7379-peopl-7dha3w
|
Sorry about that @Pomax! Conflicts are now resolved and ready for re-review :D |
Pomax
approved these changes
Oct 7, 2021
Pomax
pushed a commit
that referenced
this pull request
Oct 19, 2021
… slider (#7402) CI looks stuck - overriding added external link icon and removed price/dollar-sign (#7394) * added external link icon and removed price/dollar-sign * Update product.scss * Update product.scss Co-authored-by: Daniel Miranda <[email protected]> Update continous-integration.yml Update prod-like-ci.yml added new date format to match figma file (#7395) * added new date format to match figma file Co-authored-by: Pomax <[email protected]> Co-authored-by: Daniel Miranda <[email protected]> Updated order of items, as well as renamed Updates section to News (#7400) * Updated order of items, as well as renamed Updates section to News Co-authored-by: Pomax <[email protected]> Co-authored-by: Daniel Miranda <[email protected]> Create README.md Delete README.md 7374 - Added Category Bubbles Added padding hide the softwareproductpage child page type (#7419) removed company contact information fields from template and cms/models (#7401) * removed company contact information fields from template and cms/models Co-authored-by: Pomax <[email protected]> Co-authored-by: Daniel Miranda <[email protected]> prettier 7294 - PNI category name untranslated in page title (#7455) * 7294 - PNI category name untranslated in page title linting fix * Update network-api/networkapi/wagtailpages/pagemodels/products.py Co-authored-by: Pomax <[email protected]> Co-authored-by: Pomax <[email protected]> updated dotted background bar to be around comments (#7450) Co-authored-by: Daniel Miranda <[email protected]> 7374 - Added Category Bubbles Added padding 7387-update typesetting styling added mozilla says section (#7446) * rebase * updated migrations * Update product_page.html * Update network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html Co-authored-by: Théo Chevalier <[email protected]> * Update product_page.html * updated rebase and commits Co-authored-by: Daniel Miranda <[email protected]> Co-authored-by: Théo Chevalier <[email protected]> ai product fields (#7488) * added fields to be used in the AI panel * Update products.py Co-authored-by: Daniel Miranda <[email protected]> Localize PNI category name in page title (#7478) * Localize PNI category name in page title * Line too long 7492 additional ai fields (#7513) * added new fields, however, need to ask whether or not we want the helptext fields to go along or if they are static: * updated AI fields, as well as reordered them in the code and CMS to match new PNI product page template Co-authored-by: Daniel Miranda <[email protected]> 7389 section hrs (#7452) * added new section dividers for news and related products * updated spacing between news heading and section Co-authored-by: Daniel Miranda <[email protected]> update the ProductUpdate meta class to include ordering (#7530) Localize category badge (#7565) 7472 - Search - update placeholder text added new lead in paragraph under the comments heading (#7572) * added new lead in paragraph under the comments heading * Update product_page.html Co-authored-by: Daniel Miranda <[email protected]> 7382 - product tabs component Added sticky Fixes update Design revisions Refactor Addressed fixes fixes 7377 mozilla researched (#7539) * added new template to house all of the research details * Update research_details.html * New localization approach for Mozilla researched (#7553) Co-authored-by: Daniel Miranda <[email protected]> Co-authored-by: Théo Chevalier <[email protected]> 7473 change "all" category on mobile to a more indicative text (#7570) fix 7379 people voted (#7541) * added migrations for mozilla researched * merge with q3 branch * merge with q3 branch * updated migrations * saving to ask design for what to do on the medium breakpoint for the mozilla says and researched section. * updated to use tailwind * added new template to house all of the research details * updated migrations * Update research_details.html * 7379-people-voted * New localization approach for Mozilla researched (#7553) * New localization approach for Mozilla researched * Remove extra spaces and simplify string * added requested changes from design and review * New localization approach for People voted (#7554) * New localization approach for People voted * remove extra spaces * Simplify string * Update most_voted_rating.html * spacing * Update research_details.html * comments * removed % sign, implemented feedback from review * Removed rogue space * Update network-api/networkapi/wagtailpages/templates/fragments/most_voted_rating.html Co-authored-by: Théo Chevalier <[email protected]> * merging with q3 Co-authored-by: Daniel Miranda <[email protected]> Co-authored-by: Théo Chevalier <[email protected]> Co-authored-by: Pomax <[email protected]> 7393 - Update Content Width Fixed 7380 tips to protect free text (#7576) * tips to protect yourself using richtext field Co-authored-by: Daniel Miranda <[email protected]> Co-authored-by: Pomax <[email protected]> updated blurb and worst case to rich text fields with 5000 char limit (#7605) Co-authored-by: Daniel Miranda <[email protected]> 7470/7474 relocate search bar (#7591) * removed unneeded JS, updated CSS, and relocated search bar to hero section of the page * updated use of variable for color white Co-authored-by: Daniel Miranda <[email protected]> Co-authored-by: Pomax <[email protected]> 7383 - Product page - add "information" links to certain fields Update network-api/networkapi/wagtailpages/templates/fragments/product_criterion_primary_info.html Co-authored-by: Théo Chevalier <[email protected]> Update network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html Co-authored-by: Théo Chevalier <[email protected]> 7386 - Content Update fixes Update network-api/networkapi/wagtailpages/templates/buyersguide/product_page.html Co-authored-by: Théo Chevalier <[email protected]> Changes vote now button enabled on-click (#7627) * vote now button enabled on-click * removed box shadow while disabled * transition Co-authored-by: Daniel Miranda <[email protected]> updated styling of search bar (#7604) * removed unneeded JS, updated CSS, and relocated search bar to hero section of the page * updated use of variable for color white * updated styling of search bar to be round with 1px black border, 6 col width * css changes requested by design Co-authored-by: Daniel Miranda <[email protected]> 7441 category share data (#7606) * added new image field, then checking if we can use them for share data * comment * migrations and Theo's localization feedback * formatting * updated migrations * localization of category share data * Removing slug from editable panels Co-authored-by: Daniel Miranda <[email protected]> Add subcategory functionality to PNI categories. (#7641) * add "subcategories" by letting categories specify a parent. migration fix
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #7379
Related PRs/issues: Please note this PR depends on #7539.
Link to sample test page: https://foundation-s-7379-peopl-7dha3w.herokuapp.com/en/privacynotincluded/trade-want-safe-couple-before-glass-detail/
Steps to test:
Checklist
Changes in Models: