Tracking pull request to merge main-release-jan-2024 to master #2750
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
chore: Backend Image Version Update
…26.18 Bump urllib3 from 1.26.12 to 1.26.18 in /backend
Improve the error message shown when a user tries to propose a credit transfer with an empty Agreement Date field. Previous message: 'Error! Date has wrong format. Use one of these formats instead: YYYY-MM-DD.' New message: 'Error! Please enter a valid date in the Agreement Date field: YYYY-MM-DD.'
Reduce the width of the 'Effective Date' column and widen the 'Comments' column in Excel export for better data readability. Due to the previously added 'Category' column, adjust the numbers of all columns after column 7 by increasing them by one. (Column numbers start from 0)
…-sheet-column-width-2684 fix: adjust column widths in xls transactions sheet
…rr-msg-2469 fix: adjust credit transfer agreement date error message (#2469)
…option-2553 fix: removed 2023 option from compliance report dropdown
This commit reverts unintended label changes on the 'Edit Organization' page to their original state, ensuring UI consistency for IDIR users. Closes #2704
…-changes-2704 fix: revert org status label changes on edit organization page
Bumps [django](https://github.com/django/django) from 3.2.20 to 3.2.23. - [Commits](django/django@3.2.20...3.2.23) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
…option-2553 Fix/kevin remove 2023 compliance option 2553
Bump django from 3.2.20 to 3.2.23 in /backend
Compliance Report Model changes to include latest_report and root_report information To migrate the data to these new columns Using select_related and prefetch_related wherever necessary Making use of the new columns in data retrieval
Since cache wasn't showing the updated details. have removed it for now.
- Added cache for Compliance Report & Organizations - changes to ComplianceReport Query to retrieve latest reports
…rical-2773 feat: TFRS - Adjust 'Part 3 Award' label for transaction type in the Historical Data Entry feature #2773
…bel-issue-2772 Fix: Fix incorrect labels in initiative agreement issuance transaction - 2772
…date-2774 Fix: Update labels in notifications settings as per new act - 2774
…-2785 Fix: Update user guide links - 2785
…-confirmation-2789 Fix: Correct labels transfer confirmation - 2789
…x-2769 FIX: HDE Transactions effective date fix in spreadsheet 2769
fix: fixes on label and compliance years
…of-transfer-2095-2768 Fix: Correct effective date of transfer 2095 - 2768
…-2773 fix part 3 label in the historical data entry table - 2773
…date-2774 Fix: Update two notifications labels - 2774
…-confirmation-2789 Fix: Update Modal ConfirmLabel Logic for Transaction Types - 2789
…of-transfer-2095-2768 Fix: Fix compliance period year of transfer 2095 - 2768
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.
No description provided.