Sakai.Git

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-44242: SAMIGO - Duplicated headscripts.js (#8532)

Co-authored-by: Fernando Alvarez <fernando.alvarez1@um.es>

    • -1
    • +0
    /samigo/samigo-app/src/webapp/include/header.inc
SAK-44242: SAMIGO - Duplicated headscripts.js (#8532)

Co-authored-by: Fernando Alvarez <fernando.alvarez1@um.es>

(cherry picked from commit b971b15b3f95acc9e6d2ea4621b1204ffdd04ac4)

    • -1
    • +0
    /samigo/samigo-app/src/webapp/include/header.inc
SAK-44220 ELFinder RTE produces an HTTP 500 (#8529)

SAK-44220 ELFinder RTE produces an HTTP 500 (#8529)

(cherry picked from commit 627c83bf99464ac862992c2b595f01a8da32b941)

Move version to 22-SNAPSHOT

    • -1
    • +1
    /announcement/announcement-api/api/pom.xml
    • -1
    • +1
    /announcement/announcement-impl/impl/pom.xml
    • -1
    • +1
    /announcement/announcement-tool/tool/pom.xml
  1. … 442 more files in changeset.
SAK-42331 WIP move local styles from delegatedaccess to library (#8238)

* SAK-42510 swap asmselect for bootstrap-multiselect

* SAK-42510 working and ready for cleanup

* SAK-42510 ready for PR

* SAK-42510 fix accessibility and table based layout

* SAK-42510 codacy fix via comment

Co-authored-by: Earle Nietzel <earle@longsight.com>

SAK-44217 fix issue where Samigo GB item was being re-created every time assessment re-saved (#8528)

* SAK-44217 fix issue where Samigo GB item was being re-created every time the assessment was re-saved

* simpler return

(cherry picked from commit c8921493d661136627441c8ea8cea0e06be8b46e)

SAK-44217 fix issue where Samigo GB item was being re-created every time assessment re-saved (#8528)

* SAK-44217 fix issue where Samigo GB item was being re-created every time the assessment was re-saved

* simpler return

SAK-43000 Give assessment settings expand/collapse all functions consistent icons and highlighting (#7764)

    • -1
    • +20
    /samigo/samigo-app/src/webapp/js/authoring.js
SAK-43000 Give assessment settings expand/collapse all functions consistent icons and highlighting (#7764)

(cherry picked from commit 9708e85f2a6ef64a66f06264cec14c7b32bb096a)

    • -1
    • +20
    /samigo/samigo-app/src/webapp/js/authoring.js
SAK-42911 Change part titles by default when one is created (#7702)

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

Previously this was suposed to be managed by two different selectOneMenu

within the ItemHeadings file, but their selectItems are equal. I also

believe the rendered options were a bit strange, I'd say the only

important check for this is itemauthor.target == 'questionpool' but I'd

like someone else to confirm that, if possible.

(cherry picked from commit 4d3039c8dda4ed448dad81c7906c34fc88d1e7a3)

Conflicts:

samigo/samigo-app/src/webapp/jsf/author/item/itemHeadings.jsp

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

Previously this was suposed to be managed by two different selectOneMenu

within the ItemHeadings file, but their selectItems are equal. I also

believe the rendered options were a bit strange, I'd say the only

important check for this is itemauthor.target == 'questionpool' but I'd

like someone else to confirm that, if possible.

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

Previously this was suposed to be managed by two different selectOneMenu

within the ItemHeadings file, but their selectItems are equal. I also

believe the rendered options were a bit strange, I'd say the only

important check for this is itemauthor.target == 'questionpool' but I'd

like someone else to confirm that, if possible.

(cherry picked from commit 4d3039c8dda4ed448dad81c7906c34fc88d1e7a3)

SAK-43033: Bullhorns: Group assignments displaying twice (#8131)

Co-authored-by: Fernando Alvarez <fernando.alvarez1@um.es>

SAK-43033: Bullhorns: Group assignments displaying twice (#8131)

Co-authored-by: Fernando Alvarez <fernando.alvarez1@um.es>

(cherry picked from commit 9d79a45137fa91e57ab37cbbc95a0c91540f9d31)

SAK-43266: Correct capitalize 'Enter access View' (#8329)

Co-authored-by: Fernando Alvarez <fernando.alvarez1@um.es>

SAK-43853 Ensure resubmit date is valid in grader (#8527)

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

SAK-43853 Ensure resubmit date is valid in grader (#8527)

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

(cherry picked from commit b0c040213cf16bd2b5e7139e6f4a7057540bde90)

SAK-43104 Samigo allow user with permission assesment.grade.any to grade (#8492)

* SAK-43104 make use of the assesment.grade.any permission to allow TA to grade

* SAK-43104 use the constants

(cherry picked from commit 247bcfc4e9c34cbb4c7555f14c6f95c53337feec)

SAK-43104 Samigo allow user with permission assesment.grade.any to grade (#8492)

* SAK-43104 make use of the assesment.grade.any permission to allow TA to grade

* SAK-43104 use the constants

(cherry picked from commit 247bcfc4e9c34cbb4c7555f14c6f95c53337feec)

(cherry picked from commit a572f5c858d4b01c625aad8f2e3eec28fab38b35)

SAK-43104 Samigo allow user with permission assesment.grade.any to grade (#8492)

* SAK-43104 make use of the assesment.grade.any permission to allow TA to grade

* SAK-43104 use the constants

SAK-44150: samigo > add button to copy published assessment url to clipboard (a11y) (#8503)

SAK-44150: samigo > add button to copy published assessment url to clipboard (a11y) (#8503)

(cherry picked from commit 6669441f03462068bff633c53f9f814546d52f80)

SAK-44171 Lessons tool does not display Resource folder displayname (#8486)

* SAK-44171 Lessons tool does not display Resource folder displayname

* SAK-44171 Lessons tool does not display Resource folder displayname

add improvements suggested in github comments

* SAK-44171 Lessons tool does not display Resource folder displayname

exception displays the collection id so we don't need to include it.

* Refactor of original PR

Co-authored-by: Earle Nietzel <earle@longsight.com>

SAK-44171 Lessons tool does not display Resource folder displayname (#8486)

* SAK-44171 Lessons tool does not display Resource folder displayname

* SAK-44171 Lessons tool does not display Resource folder displayname

add improvements suggested in github comments

* SAK-44171 Lessons tool does not display Resource folder displayname

exception displays the collection id so we don't need to include it.

* Refactor of original PR

Co-authored-by: Earle Nietzel <earle@longsight.com>

(cherry picked from commit ca7625fb2305604427105886b45aff0c80bf67e5)

Conflicts:

lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java

lessonbuilder/tool/src/webapp/WEB-INF/requestContext.xml

Bump xercesImpl in /announcement/announcement-impl/impl (#8426)

Bumps xercesImpl from 2.6.2 to 2.12.0.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    • -1
    • +1
    /announcement/announcement-impl/impl/pom.xml
SAK-43810: jsf > add tabindex=0 to colour picker icons (#8518)

SAK-43782 Grader feedback comment updates correctly (#8526)

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

SAK-43782 Grader feedback comment updates correctly (#8526)

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

(cherry picked from commit b02919aff6ded0c637ba3084c23a596c9ab19473)