Patch 3.6.5 #3267
Merged
Patch 3.6.5 #3267
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
…een-instead-of-white-screen LF-3946 Show a fallback screen instead of white screen
And lint the scss file as I think only my editor does so
…rs-and-variants-throughout-app LF-4178 Update button colours and variants throughout app
…ber-input-with-localization-support Lf 3934 create separate number input with localization support
* cherry-pick be23eb6, remove change in SexDetailsCountInput
* cherry-pick b469ee9, remove changes in SexDetailsCountInput and SexDetails
… empty when value is 0
* add the change in 184e211
* cherry-pick 08d3fc8, remove changes in AddAnimalsFormCard
* cherry-pick 7549d0d, remove changes in AddAnimalsFormCard and AddAnimalsFormCard scss
* taken from ad46efe
…orting * taken from f1e9904
…add-columns-to-product-table-and-create-update-ap-is LF-4215 Write migration to add columns to product table and create update APIs
…r_product_section_buttons LF-4217: Create component for product section buttons
* cherry-pick bf21908, remove KPI Dashboard changes
* taken from 5af0c33
Also lint the mixin file
…-only-it-might-be-too-much-to-have-name-and-npk-all-in-select-option-and-there-should-probably-be-some-padding-between-the-end-of-product-name-and-n LF-4342 For the mobile view only it might be too much to have name and npk all in select option and there should probably be some padding between the end of product name and n
…atch/3.6.5_api_job_locales New Crowdin translations
…nput_field LF-4315: Magnetic supplier input field
…er-to-dry-or-liquid patch/3.6.5 update input text based upon farmer feedback
…nitially undefined This was the issue happening on Duncan and Sayaka's local env but not mine -- mysterious
…e-to-complete-a-task-any-task-for-a-farm-worker-account-without-an-email LF-4346 The user is not able to complete a task any task for a farm worker account without an email
…atch/3.6.5_webapp_locales New Crowdin translations
LF-4348 Demo branch -- Pass other_purpose_id as a form field
Update version number
kathyavini
requested review from
Duncan-Brain and
kathyavini
and removed request for
a team
kathyavini
approved these changes
Jul 25, 2024
|
WOOO LGTM |
Duncan-Brain
approved these changes
Jul 25, 2024
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.
Description
Branched out from the
mainbranch and mainly cherry-picked merge commits from theintegrationbranch.Main features included:
I also cherry-picked individual commits where files were touched in different PRs after the merge commit, like NumberInput.
There were many commits made to
colors.scss, so I didn't cherry-pick all of them. We could try cherry-picking more commits if we want, or usegit checkout integration -- <file>to grab the changes from the integration branch. However, I believe the missing colours in this PR are for animals.Merge conflicts are expected in these files when merging main into integration, but they should be straightforward to resolve.
Jira link: https://lite-farm.atlassian.net/browse/LF-4231