Sakai.Git

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-44886 - Cleanup and document role mapping (#8964)

* SAK-44886 - Cleanup and document role mapping

* SAK-44886 - Review related fixes

* SAK-44886 - Use a Set

    • -0
    • +97
    /basiclti/docs/LTIROLES.md
SAK-44895 Update MariaDB Connector/J 2.7.1 (#8959)

SAK-44898 - Configurable job name and description not being translated (#8966)

(cherry picked from commit 0abd6e577e2f74195655ce9dff86c25796cb1a90)

SAK-44898 - Configurable job name and description not being translated (#8966)

(cherry picked from commit 0abd6e577e2f74195655ce9dff86c25796cb1a90)

SAK-44898 - Configurable job name and description not being translated (#8966)

SAK-43138 Display visible status in tool menu (#8900)

replace getFormattedText() with Web in 20.x

SAK-44651 Fix save button on pagepicker for adding existing page to left margin (#8962)

Regression with pagepickerproducer submit workflow from SAK-44159.

SAK-44651 Fix save button on pagepicker for adding existing page to left margin (#8962)

Regression with pagepickerproducer submit workflow from SAK-44159.

(cherry picked from commit fc4ce032d7283b69fd259aab72efb527c00c8eaf)

SAK-44811 Catch errors inside iframes (#8963)

* SAK-44811 - Catch more iframe blocked content situations

* SAK-44811 - Codacy

* SAK-44811 - Clean up markup / accessibility

* SAK-44811 - Remove form button as requested by Andrea.

(cherry picked from commit 8758ce3e5c379c8679ca6e1cb5ab7d408f003bf2)

SAK-44811 Catch errors inside iframes (#8963)

* SAK-44811 - Catch more iframe blocked content situations

* SAK-44811 - Codacy

* SAK-44811 - Clean up markup / accessibility

* SAK-44811 - Remove form button as requested by Andrea.

(cherry picked from commit 8758ce3e5c379c8679ca6e1cb5ab7d408f003bf2)

SAK-44811 Catch errors inside iframes (#8963)

* SAK-44811 - Catch more iframe blocked content situations

* SAK-44811 - Codacy

* SAK-44811 - Clean up markup / accessibility

* SAK-44811 - Remove form button as requested by Andrea.

SAK-44865 - Bug fix saveSite messes up when import is in thread (#8961)

* SAK-44865 - Context.id.history support

* SAK-44865 - Import LTICustomVars

* SAK-44865 - Use Set instead of List

* SAK-44865 - Bug fix saveSite messes up when import is in thread

* SAK-44865 - Fix up merge artifacts

(cherry picked from commit 623248729b3b750a1a7bff79b76d85a3c8e2c3ba)

Conflicts:

basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiBLTIUtil.java

SAK-44865 - Bug fix saveSite messes up when import is in thread (#8961)

* SAK-44865 - Context.id.history support

* SAK-44865 - Import LTICustomVars

* SAK-44865 - Use Set instead of List

* SAK-44865 - Bug fix saveSite messes up when import is in thread

* SAK-44865 - Fix up merge artifacts

SAK-44865 - Bug fix saveSite messes up when import is in thread (#8961)

* SAK-44865 - Context.id.history support

* SAK-44865 - Import LTICustomVars

* SAK-44865 - Use Set instead of List

* SAK-44865 - Bug fix saveSite messes up when import is in thread

* SAK-44865 - Fix up merge artifacts

(cherry picked from commit 623248729b3b750a1a7bff79b76d85a3c8e2c3ba)

SAK-44880: SAMIGO - Error on log when printing PDF assessment that contains a BASE64 image (#8950)

SAK-44880: SAMIGO - Error on log when printing PDF assessment that contains a BASE64 image (#8950)

(cherry picked from commit 72492f81390692e95d0a138e1188f9c888f14408)

SAK-44880: SAMIGO - Error on log when printing PDF assessment that contains a BASE64 image (#8950)

(cherry picked from commit 72492f81390692e95d0a138e1188f9c888f14408)

SAK-44614 Make it clearer that min and neg can't be used at the same time. (#8958)

https://jira.sakaiproject.org/browse/SAK-44614

    • -15
    • +25
    /samigo/samigo-app/src/webapp/js/authoring.js
SAK-44614 Make it clearer that min and neg can't be used at the same time. (#8958)

https://jira.sakaiproject.org/browse/SAK-44614

(cherry picked from commit dda10357eb5d38d333f80d0204ac55d8f6019149)

    • -15
    • +25
    /samigo/samigo-app/src/webapp/js/authoring.js
SAK-44614 Make it clearer that min and neg can't be used at the same time. (#8958)

https://jira.sakaiproject.org/browse/SAK-44614

(cherry picked from commit dda10357eb5d38d333f80d0204ac55d8f6019149)

    • -15
    • +25
    /samigo/samigo-app/src/webapp/js/authoring.js
SAK-44585 number type on rubric input breaks html validation (#8955)

https://jira.sakaiproject.org/browse/SAK-44585

(cherry picked from commit 43257c92d27eb06c5446f201659425130a125ca7)

SAK-44585 number type on rubric input breaks html validation (#8955)

https://jira.sakaiproject.org/browse/SAK-44585

SAK-44613 Only apply min score if partial credit not on (#8957)

https://jira.sakaiproject.org/browse/SAK-44613

SAK-44613 Only apply min score if partial credit not on (#8957)

https://jira.sakaiproject.org/browse/SAK-44613

(cherry picked from commit b6874e0dbee4281ced9c8ac6e24b227e3e0c6dcc)

SAK-44850 Set sortName to displayName when anon grading (#8954)

https://jira.sakaiproject.org/browse/SAK-44850

(cherry picked from commit 4147df455849172bf7ac5ab3948361136171a34b)

SAK-44850 Set sortName to displayName when anon grading (#8954)

https://jira.sakaiproject.org/browse/SAK-44850

(cherry picked from commit 4147df455849172bf7ac5ab3948361136171a34b)

SAK-44850 Set sortName to displayName when anon grading (#8954)

https://jira.sakaiproject.org/browse/SAK-44850

Revert "SAK-42874 T&Qs remove 'copy from pool' option inside pool menu (#7663)"

This reverts commit ac971fc4bffe02b410144ebb4d553166ebbefc6f.

SAK-44561 Error parsing the date/time PA SYSTEM Create Banner (#8844)

SAK-44611 Forums: Rubric icon does not appear from ELFinder links (#8784)

(cherry picked from commit 6c698edb1ea9542874166e6877eb1cda294a847c)