Sakai.Git

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-44876 Fix auto provision broken / in the wrong place (#8946)

(cherry picked from commit 8d0cbd090b8560cdf7c253458f315b5fcbe902f0)

SAK-44876 Fix auto provision broken / in the wrong place (#8946)

SAK-44871 - Redo MVP discussion import CC / CO / DL (#8945)

SAK-44865 - Context.id.history support (#8939)

* SAK-44865 - Context.id.history support

* SAK-44865 - Import LTICustomVars

* SAK-44865 - Use Set instead of List

(cherry picked from commit 92ae45c3a05fed7d5db192c5ff054ba73c3e9ebd)

    • -0
    • +5
    /site-manage/site-manage-impl/impl/pom.xml
SAK-44865 - Context.id.history support (#8939)

* SAK-44865 - Context.id.history support

* SAK-44865 - Import LTICustomVars

* SAK-44865 - Use Set instead of List

(cherry picked from commit 92ae45c3a05fed7d5db192c5ff054ba73c3e9ebd)

    • -0
    • +5
    /site-manage/site-manage-impl/impl/pom.xml
SAK-44865 - Context.id.history support (#8939)

* SAK-44865 - Context.id.history support

* SAK-44865 - Import LTICustomVars

* SAK-44865 - Use Set instead of List

    • -0
    • +5
    /site-manage/site-manage-impl/impl/pom.xml
SAK-44810 - ResouceLink.id.history subsitution variable (#8938)

* SAK-44810 - ResouceLink.id.history subsitution variable

* SAK-44810 - allowsettings -> allowsettings_ext

* SAK-44810 - Separate CONTEXT_ID_HISTORY ito separate JIRA

(cherry picked from commit 8c48bcdee39cb3fc519a502fd0929437859e9cc9)

Conflicts:

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

basiclti/basiclti-common/src/test/org/sakaiproject/basiclti/util/SakaiBLTIUtilTest.java

basiclti/basiclti-impl/src/bundle/ltiservice_ar.properties

basiclti/basiclti-impl/src/bundle/ltiservice_de_DE.properties

basiclti/basiclti-impl/src/bundle/ltiservice_fr_FR.properties

  1. … 4 more files in changeset.
SAK-44810 - ResouceLink.id.history subsitution variable (#8938)

* SAK-44810 - ResouceLink.id.history subsitution variable

* SAK-44810 - allowsettings -> allowsettings_ext

* SAK-44810 - Separate CONTEXT_ID_HISTORY ito separate JIRA

(cherry picked from commit 8c48bcdee39cb3fc519a502fd0929437859e9cc9)

  1. … 6 more files in changeset.
SAK-44810 - ResouceLink.id.history subsitution variable (#8938)

* SAK-44810 - ResouceLink.id.history subsitution variable

* SAK-44810 - allowsettings -> allowsettings_ext

* SAK-44810 - Separate CONTEXT_ID_HISTORY ito separate JIRA

  1. … 6 more files in changeset.
SAK-44875 - Second attempt to fix unit tests (#8944)

(cherry picked from commit 5d6a219be0ac541492fc2093b03d9a2d15aa59b1)

SAK-44875 - Second attempt to fix unit tests (#8944)

(cherry picked from commit 5d6a219be0ac541492fc2093b03d9a2d15aa59b1)

SAK-44875 - Second attempt to fix unit tests (#8944)

SAK-44875 - Fix regression in uit tests (#8943)

(cherry picked from commit 71e985a5ecaf098ef05997a0259c9044348029a0)

SAK-44875 - Fix regression in uit tests (#8943)

SAK-44875 - Fix regression in uit tests (#8943)

(cherry picked from commit 71e985a5ecaf098ef05997a0259c9044348029a0)

SAK-44728 Make locked and visible less confusing. (#8940)

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

(cherry picked from commit 0dd679fc0e24b7d422cceafa6c6d96863ffca0d6)

Conflicts:

webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubrics-manager.js

  1. … 9 more files in changeset.
SAK-44728 Make locked and visible less confusing. (#8940)

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

(cherry picked from commit 0dd679fc0e24b7d422cceafa6c6d96863ffca0d6)

  1. … 9 more files in changeset.
SAK-44728 Make locked and visible less confusing. (#8940)

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

  1. … 9 more files in changeset.
SAK-44805 Mark assignment tasks complete on submission (#8929)

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

(cherry picked from commit 159131367ff90fea9c850dd6beb72c133e35bd54)

  1. … 23 more files in changeset.
SAK-44805 Mark assignment tasks complete on submission (#8929)

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

  1. … 23 more files in changeset.
SAK-44815 Library - fixes incorrect CSS class in previous patch (#8937)

SAK-44815 Library - fixes incorrect CSS class in previous patch (#8937)

(cherry picked from commit 43b22c3728ee370b892d14d3347fa4cade32589a)

SAK-42371 Saving rubric comment triggers draft save. (#8935)

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

(cherry picked from commit b9e71b63ff5886d8126042195009ce26cc2a2830)

SAK-42371 Saving rubric comment triggers draft save. (#8935)

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

SAK-42371 Saving rubric comment triggers draft save. (#8935)

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

(cherry picked from commit b9e71b63ff5886d8126042195009ce26cc2a2830)

SAK-44857 - Cleanup TODO comment and some empty checks (#8934)

(cherry picked from commit a16ad15fc90fc5ad1be1e97f9759e81475909295)

Conflicts:

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

SAK-44857 - Cleanup TODO comment and some empty checks (#8934)

SAK-44857 - Cleanup TODO comment and some empty checks (#8934)

(cherry picked from commit a16ad15fc90fc5ad1be1e97f9759e81475909295)

SAK-44859 - upgrade user audit service to jsf2 (#8933)

    • -0
    • +6
    /userauditservice/tool/src/webapp/META-INF/context.xml
    • -0
    • +6
    /userauditservice/tool/src/webapp/WEB-INF/beans.xml
SAK-44849 - upgrade stuff to jsf2 (#8932)

    • -0
    • +6
    /admin-su/src/webapp/META-INF/context.xml
    • -0
    • +6
    /admin-su/src/webapp/WEB-INF/beans.xml
    • -1
    • +1
    /admin-su/src/webapp/su/unauthorized.jsp