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

Merge #1

Merged
merged 1,393 commits into from
Feb 16, 2024
Merged

Merge #1

merged 1,393 commits into from
Feb 16, 2024

Conversation

Ayushsunny
Copy link
Owner

Main to Master

reemhamz and others added 30 commits September 18, 2023 12:23
This removes the duplicated content that we have on bedrock
and in HackerOne and replaces it with pointers to the
HackerOne policy content which is authoritative
* Add new supported EU countries to Relay #13656

- import new data structure from Relay
- update templatetags to account for new data structure
- add function to create ga-data object
- update tests to consider analytics will always be there
- add tests for currency formatting
- change tests which expected a different default region for multi reigon countries
- add some error messages when product is unrecognized instead of falling back
* update social-content page

* Update url without redirect
* fixing up moz account FTL files

* removing non-Mozilla brand name variables from new strings and making them regular strings

* reverted products.ftl

* updated accounts page subnav

* created new versions of strings

* review changes from flod

* updated strings in security pages, reverted obsolete feature pages strings
Resolves #13698 - Bump ruff from 0.0.287 to 0.0.290 in /requirements
Resolves #13696 - Bump pillow from 10.0.0 to 10.0.1 in /requirements
Resolves #13693 - Bump cryptography from 41.0.3 to 41.0.4 in /requirements
Resolves #13691 - Bump sentry-sdk from 1.30.0 to 1.31.0 in /requirements
Resolves #13628 - Bump newrelic from 8.10.0 to 9.0.0 in /requirements
Resolves #13662 - Bump translate-toolkit from 3.9.2 to 3.10.1 in /requirements
Resolves #13697 - Bump compare-locales from 9.0.1 to 9.0.2 in /requirements
reemhamz and others added 29 commits February 5, 2024 10:57
* removed mobile compare page and references

* removed decomissioned compare bundles
Add new hero variant to German CTD page [fix #14170]
* Update Monitor copy

* PR revisions

* fix lang conditional in accounts page

---------

Co-authored-by: Reem H <[email protected]>
* Fix malformed link on firefox/browsers/best-browser/  [fixes mozmeao/www-site-checker/issues/324]
* Update copy on firefox/welcome/7/ and firefox/welcome/8/
* Hide second CTA on firefox/products/
* Bump dependencies

Prod
Handles #14163: Bump pygithub from 2.1.1 to 2.2.0
Handles #14156: Bump boto3 from 1.34.25 to 1.34.32
Handles #14164: Bump botocore from 1.34.25 to 1.34.32
Handles #14155: Bump sentry-sdk from 1.39.2 to 1.40.0
Handles #14153: Bump newrelic from 9.5.0 to 9.6.0
Handles #14165: Bump pyopenssl from 23.3.0 to 24.0.0
Handles #14151: Bump cryptography from 41.0.7 to 42.0.2

Dev
Handles #14160: Bump ruff from 0.1.14 to 0.1.15
Handles #14149: Bump pytest-django from 4.7.0 to 4.8.0

Docs
Handles #14154: Bump sphinx-rtd-theme from 1.3.0 to 2.0.0
Handles #14152: Bump sphinxcontrib-websupport from 1.2.4 to 1.2.7

Supdeps updated in passing:
Handles #14159: Bump referencing from 0.32.1 to 0.33.0

* Fix minor formatting warnings while testing docs build
Remove VPN pricing position experiment, move pricing to top [fix #14176]
* Add a warning that Nightly will be updated once/twice a day

* Fix linting error and update string
* update old call-out instances to new callout
* removed deprecated internships page
* updated newsletter component
* updated instances of call_out macro to callout
* added classname to callout compact for styling
* added analytics events in newsletter
@Ayushsunny Ayushsunny merged commit 6da0796 into Ayushsunny:master Feb 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.