Sakai.Git

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-42465 Add user.view.any permission to allow global user lookups for webservices (#7334)

This adds a new user.view.any permission to support the use-case for a webservice account

to be able to look up user information through the /direct/user endpoint, without the account

needing to be admin-equivalent.

This can be achieved at a global level by setting the server configuration property

entity.users.viewall=true, but that applies to all users. The user.view.any permission

can be set for a specific account or group of accounts by creating a special account

type (e.g. "webservice"), creating a user template role (e.g. !user.template.webservice),

and then setting the permission for the .auth role in the template realm.

SAK-42432 Fix Sakai banner when passwords match (#7338)

SAK-42470 return the new merged entity after a Hibernate merge() (#7335)

* SAK-42470 return the new merged entity after a Hibernate merge()

* SAK-42470 more calls to saveMessage

(cherry picked from commit 2e52e305099159307f82d0d38656a83006383b75)

SAK-42470 return the new merged entity after a Hibernate merge() (#7335)

* SAK-42470 return the new merged entity after a Hibernate merge()

* SAK-42470 more calls to saveMessage

SAK-34033 handle QTI 1.2 import with Cognero-generated multiple choice (#7337)

SAK-34033 handle QTI 1.2 import with Cognero-generated multiple choice (#7337)

(cherry picked from commit ab2e0e68ffa6ca347c0fcf218bfcf503de5bb554)

SAK-34033 handle QTI 1.2 import with Cognero-generated multiple choice (#7337)

(cherry picked from commit ab2e0e68ffa6ca347c0fcf218bfcf503de5bb554)

SAK-42467 Add portalCDNQuery to any js downloads (#7336)

Roster

Gradebook

Profile2

Commons

    • -13
    • +10
    /commons/tool/src/webapp/WEB-INF/bootstrap.jsp
  1. … 3 more files in changeset.
SAK-42467 Add portalCDNQuery to any js downloads (#7336)

Roster

Gradebook

Profile2

Commons

(cherry picked from commit 8b54416c8463c4cf6b50cd0d5e457dc4805ad62d)

Conflicts:

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/component/GbGradeTable.java

profile2/tool/src/java/org/sakaiproject/profile2/tool/pages/BasePage.java

roster2/tool/pom.xml

roster2/tool/src/java/org/sakaiproject/roster/tool/RosterTool.java

roster2/tool/src/webapp/WEB-INF/bootstrap.jsp

    • -13
    • +10
    /commons/tool/src/webapp/WEB-INF/bootstrap.jsp
  1. … 3 more files in changeset.
SAK-42030 Added moment.js to samigo settings page (#7333)

We need to do this as lessons hosts the settings page in an iframe.

Portal's copy of moment.js is therefore not available.

    • -20
    • +20
    /library/src/webapp/js/headscripts.js
SAK-42030 Added moment.js to samigo settings page (#7333)

We need to do this as lessons hosts the settings page in an iframe.

Portal's copy of moment.js is therefore not available.

(cherry picked from commit c72be9431e5f5ce23af8e0fd347a3b51770d6eb7)

Conflicts:

library/src/webapp/js/headscripts.js

    • -20
    • +20
    /library/src/webapp/js/headscripts.js
SAK-42365 Fixed rubrics iframe issues in lessons (#7332)

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

Also, refactored rubrics to inherit from RubricsElement. Common stuff

will move in there as we move forward. The rubrics lightbox stuff is now

in a module and not imported as a script tag.

    • -0
    • +14
    /rubrics/tool/src/main/frontend/webcomponents/rubrics-element.js
  1. … 19 more files in changeset.
SAK-42365 Fixed rubrics iframe issues in lessons (#7332)

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

Also, refactored rubrics to inherit from RubricsElement. Common stuff

will move in there as we move forward. The rubrics lightbox stuff is now

in a module and not imported as a script tag.

(cherry picked from commit 6445d2504a06046f7a11a0df0ed0d5ff35ba12c7)

Conflicts:

rubrics/tool/src/main/frontend/webcomponents/sakai-rubric-criterion-readonly.js

    • -0
    • +14
    /rubrics/tool/src/main/frontend/webcomponents/rubrics-element.js
  1. … 19 more files in changeset.
SAK-42065 fix merge error

SAK-42456 clean up advisor use in SiteEmailNotificationAnnc (#7330)

(cherry picked from commit 03a2ba2242c2e6ef0dddb32a1860e75c0b5a5a7e)

SAK-42456 clean up advisor use in SiteEmailNotificationAnnc (#7330)

SAK-41462: GradeBook - Corrected popover bug (#7318)

SAK-33439 Persist gradebook item column choices (#7322)

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

Persist hidden gradebook item columns in session storage and on the

server as a user preference. That way you can move between machines

and keep your item choices.

(cherry picked from commit 693e7a52f40b4cb0ee90d42dc1f6bea051a57634)

    • -0
    • +22
    /library/src/webapp/js/view-preferences.js
SAK-33439 Persist gradebook item column choices (#7322)

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

Persist hidden gradebook item columns in session storage and on the

server as a user preference. That way you can move between machines

and keep your item choices.

    • -0
    • +22
    /library/src/webapp/js/view-preferences.js
SAK-42427 Podcasts: UI Revamp (#7313)

SAK-42442 fix the reversal of logic introduced in e433665fe0ac2ae16174ed5861dab28a27a640e0 (#7324)

SAK-42442 fix the reversal of logic introduced in e433665fe0ac2ae16174ed5861dab28a27a640e0 (#7324)

(cherry picked from commit 2265d76ca4794e218b6b522ebc384fd7f08d51cd)

SAK-42065 Remove bullhorn alert when removing announcement (#7090)

SAK-42065 Remove bullhorn alert when removing announcement (#7090)

(cherry picked from commit 88a1e6b40c38f536918c673defe3d71edaec66e2)

SAK-42435

(cherry picked from commit be7c649ab42691f548b4a4351f39d5102e601bd8)

SAK-42435

(cherry picked from commit be7c649ab42691f548b4a4351f39d5102e601bd8)

SAK-42420 Samigo autosubmit checkbox label is not aligned with it's c… (#7306)

(cherry picked from commit 24d45772b80f10e2ab13407377cd6c6176917b01)

SAK-42420 Samigo autosubmit checkbox label is not aligned with it's c… (#7306)

SAK-42418 Give sitestats /direct/runreport a siteID for system-wide reports (#7305)

(cherry picked from commit 6e18eda306d74f813bde0cb20e3b5fcba61c67e8)

Conflicts:

sitestats/sitestats-tool/src/java/org/sakaiproject/sitestats/tool/entityproviders/SiteStatsEntityProvider.java