Charles Severance

SAK-45256 fix this for the jsf2 folder too (#9144)

* SAK-45256 Add userTheme to tool markup <html tags

* SAK-45256 - Check if themes are enabled (From Shawn)

* SAK-45256 - Add the changes to jsf2

SAK-45256 Add userTheme to tool markup <html tags (#9141)

* SAK-45256 Add userTheme to tool markup <html tags

* SAK-45256 - Check if themes are enabled (From Shawn)

SAK-45222 - Don't check allow launch key changes. (#9122)

(cherry picked from commit 6c9d1f4aa9d2dd538cae08210323accf7937d779)

SAK-45222 - Don't check allow launch key changes. (#9122)

SAK-44970 - Copy LTI links which are part of assignments during import (#9028)

SAK-44970 - Copy LTI links which are part of assignments during import (#9028)

(cherry picked from commit 6e75761f3274cc70f5a943d59b38e690bcfc60a3)

SAK-44823 - Add title and aria tag to profile dropdown (#8982)

* SAK-44823 - Add title and aria tag to profile dropdown

* SAK-44823 - Add role=menuitem

* SAK-44823 - From Adrian

* Updates

* SAK-44823 - Testing with Shawn and Chris

* SAK-44823 - Switch the toggle in to JavaScript libraries

* SAK-44823 - Change which tag gets "aria-expanded"

* SAK-44823 - Remove redundant aria-title

SAK-44823 - Add title and aria tag to profile dropdown (#8982)

* SAK-44823 - Add title and aria tag to profile dropdown

* SAK-44823 - Add role=menuitem

* SAK-44823 - From Adrian

* Updates

* SAK-44823 - Testing with Shawn and Chris

* SAK-44823 - Switch the toggle in to JavaScript libraries

* SAK-44823 - Change which tag gets "aria-expanded"

* SAK-44823 - Remove redundant aria-title

(cherry picked from commit fa77c69c7610a740998e2fa8e8ce42bdccb2ea5e)

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-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-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)