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 'develop' into 'acceptation' #651

Merged
merged 24 commits into from
Apr 17, 2024
Merged

Merge 'develop' into 'acceptation' #651

merged 24 commits into from
Apr 17, 2024

Conversation

EdoStorm96
Copy link
Contributor

@EdoStorm96 EdoStorm96 commented Apr 9, 2024

So I´d like to deploy some fixes for some small issues. These are mostly textual. The only fix which has a slightly significant impact is the fix for #638. Otherwise these are just a bunch of textual changes and layout changes, with no real impact on functionality.

EdoStorm96 and others added 16 commits April 2, 2024 10:29
* deps: Update dependencies

* fix: Update dependencies with a modern version of pip-tools

* deps: added sentry-sdk

---------

Co-authored-by: Tyler Mees <[email protected]>
* fix: correct 'start of proposal' redirect for pre_approved

* fix: improve buttons on proposal_confirmation.html

* fix: diff bugfix

* fix: buttons on task and session delete

* fix: formatting

* Revert 'confirmation sent' text on button back to past tense

* Hotfix/to conclude review api view qs bug (#629)

* fix: add is_committee_review check to ToConcludeReviewApiView qs

* fix: add is_committee_review check to other API views

* formatting

---------

Co-authored-by: Ty Mees <[email protected]>

* feat: is_final_decision method on Decision model

* feat: Warning when submitting a final decision

* fix: A capital letter

* fix: Show decide review action when already decided

* feat: translations

* fix: Some fuzzy or missing translations

* feat: Turn final deicision warning into alert box

* fix: Same translation somehow needed fixing again...

* feat: Alternate action description for feedback editing

---------

Co-authored-by: Edo Storm <[email protected]>
Co-authored-by: Edo Storm <[email protected]>
Co-authored-by: Ty Mees <[email protected]>
…d_textual_changes

Fix/bugfix and textual changes
…_decide_on_detail_view

Feat/supervisor decide on detail view
@EdoStorm96 EdoStorm96 marked this pull request as draft April 9, 2024 12:33
@EdoStorm96 EdoStorm96 marked this pull request as ready for review April 16, 2024 08:53
@EdoStorm96 EdoStorm96 merged commit 5195827 into acceptation Apr 17, 2024
6 checks passed
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.

2 participants