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

[CHORE] [MER-0000] Integrate v0.29.5 #5359

Merged
merged 24 commits into from
Jan 21, 2025
Merged

[CHORE] [MER-0000] Integrate v0.29.5 #5359

merged 24 commits into from
Jan 21, 2025

Conversation

eliknebel
Copy link
Contributor

Integrate v0.29.5 back into master

nicocirio and others added 24 commits December 2, 2024 14:55
…5279)

* [FEATURE] [MER-3961] Remove Admin `Browse collab spaces` (#5276)

https://eliterate.atlassian.net/browse/MER-3961

* add page termos on prologue page

* fix spacing between elements to match figma desing

* fix warning

* consider default scoring strategy

* add tests
* extend page submission term to consider new logic

* add tests
This PR adds the "Time Limit" page term when its value is different from 0, regardless of other conditions.

https://eliterate.atlassian.net/browse/MER-4101
…ages (#5307)

* TRIAGE-1240

* trying to run the check again

* trying to run the check again
* db transaction, add lti_institution_id

* bump version

* bump version

* update unit test

* Auto format

---------

Co-authored-by: darrensiegel <[email protected]>
* full remove maybe_create_unique_sub

* set sub explicity, rename test module conflict from 29.3 change

* keep sub in memory
* prep 29.2

* [BUG FIX] [MER-4124] broken internal page links

Co-authored-by: Anders Weinstein <[email protected]>

* [BUG FIX] [MER-4126] Fix targeted retake one question at a time

* [BUG FIX] [MER-4118] Improve Student Assessment Submit Terms

* [BUG FIX] [MER-4120] One at a time setting can prevent submissions

* [BUG FIX] [MER-4123] Fix high progress low proficiency filter (#5325)

* [MER-4123] Fix filter for only pages

* [MER-4123] Adds test

* [BUG FIX] [MER-4123] Fix high progress low proficiency filter

* [BUG FIX] [MER-3507] Require instructor login when accessing course section information as account admin

* [BUG FIX] [MER-4127] Fix Learning Objectives Proficiency Distribution Hover Boundary (#5328)

Fixed boundary miscalculation of Proficiency Distribution tooltip and increased stacking context for proper visibility.

See: https://eliterate.atlassian.net/browse/MER-4127

* [BUG FIX] [MER-4011] Real chem course section creation loads indefinitely

* bump

---------

Co-authored-by: Anders Weinstein <[email protected]>
Co-authored-by: Anders Weinstein <[email protected]>
Co-authored-by: Santiago Simoncelli <[email protected]>
Co-authored-by: Gastón Abellá <[email protected]>
Co-authored-by: Nicolás Cirio <[email protected]>
Co-authored-by: Martin Manelli <[email protected]>
* prep 29.2

* [BUG FIX] [MER-4124] broken internal page links

Co-authored-by: Anders Weinstein <[email protected]>

* [BUG FIX] [MER-4126] Fix targeted retake one question at a time

* [BUG FIX] [MER-4118] Improve Student Assessment Submit Terms

* [BUG FIX] [MER-4120] One at a time setting can prevent submissions

* [BUG FIX] [MER-4123] Fix high progress low proficiency filter (#5325)

* [MER-4123] Fix filter for only pages

* [MER-4123] Adds test

* [BUG FIX] [MER-4123] Fix high progress low proficiency filter

* [BUG FIX] [MER-3507] Require instructor login when accessing course section information as account admin

* [BUG FIX] [MER-4127] Fix Learning Objectives Proficiency Distribution Hover Boundary (#5328)

Fixed boundary miscalculation of Proficiency Distribution tooltip and increased stacking context for proper visibility.

See: https://eliterate.atlassian.net/browse/MER-4127

* [BUG FIX] [MER-4011] Real chem course section creation loads indefinitely

* consider children: nil case

---------

Co-authored-by: Darren Siegel <[email protected]>
Co-authored-by: Anders Weinstein <[email protected]>
Co-authored-by: Anders Weinstein <[email protected]>
Co-authored-by: Santiago Simoncelli <[email protected]>
Co-authored-by: Gastón Abellá <[email protected]>
Co-authored-by: Martin Manelli <[email protected]>
* admin tool to restore affected progress

* ensure true user enrolled in section

* refine conflict graded page handling

* add warning, and display user details in tabular form

* finalize, docs

* Auto format

---------

Co-authored-by: darrensiegel <[email protected]>
@darrensiegel darrensiegel merged commit c85646a into master Jan 21, 2025
6 checks passed
@darrensiegel darrensiegel deleted the integrate-v0.29.5 branch January 21, 2025 14:02
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.

5 participants