Merge to prod #266
Merged
Merge to prod #266
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
* create batch actions component * update batch table to use batch actions * fix wrong translations * customize rsuitejs dropdown menu * remove fixed comment --------- Co-authored-by: Samuel T. <[email protected]>
Co-authored-by: Nicolas Dontigny <[email protected]>
* Simplified Batch properties serializers Removed 3 serializers that were not necessary, they were just copies of other serializers. Modified other serializers for batchseed and batchspecies to include a reference of the tree type to prevent id mismatch --------- Co-authored-by: Nicolas Dontigny <[email protected]>
* Extracted BatchForm in its own component --------- Co-authored-by: Nicolas Dontigny <[email protected]>
* Updated phone seed number * Added images and batch sponsor, model and migration * Added batch sponsor serializer * Re-generated api models * Using new batch sponsor for batch table and site social header * Added sponsor logos to analytics site header * Started modifying sponsors, removed mulch layer and fertilizers unused serializers * Updated BatchSeed serializer * Updated batchspecies serializers * Created BatchForm component and using it in Create Batch * Successfully uploading batch sponsor info + logo * Generated migration to make properties non-nullable * Implemented Edit Batch with sponsor info * Small fixes and comment * using different logos and sponsor names in initialize_database * Squashed migrations * front-end lint fix * Fixed initialize_database ruff * Unset eslint disabling change * re-generated package-lock * Re-generated package-lock * removed unused sponsors field in serializer --------- Co-authored-by: Nicolas Dontigny <[email protected]> Co-authored-by: Samuel T. <[email protected]>
--------- Co-authored-by: Nicolas Dontigny <[email protected]> Co-authored-by: Samuel T. <[email protected]>
--------- Co-authored-by: Nicolas Dontigny <[email protected]> Co-authored-by: Samuel T. <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Adding version back to support portainer deployments
andy2great
requested review from
Samuel-Therrien-Beslogic,
theo-auffeuvre,
BesOlivierBouchard and
NicolasDontigny
as code owners
|
(reminder to rebase merge, not squash) |
Samuel-Therrien-Beslogic
approved these changes
Oct 10, 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.
Make sure that the code wasn't copied from elsewhere (check one):
Add a description of your changes, including visual aid and useful links