Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-44342 Apply best practice when using ResourceLoader (#8611)

(cherry picked from commit 66e7b3d7d439ac6026e08fb6a7adc8f5a1974d74)

Conflicts:

calendar/calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/GenericCalendarImporter.java

commons/impl/src/java/org/sakaiproject/commons/impl/CommonsContentProducer.java

commons/tool/src/java/org/sakaiproject/commons/tool/CommonsTool.java

msgcntr/messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/ui/PrivateMessageManagerImpl.java

msgcntr/messageforums-component-impl/src/webapp/WEB-INF/components.xml

portal/portal-impl/impl/src/java/org/sakaiproject/portal/entityprovider/PortalEntityProvider.java

roster2/tool/src/java/org/sakaiproject/roster/tool/entityprovider/RosterPOIEntityProvider.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/ItemConfigBean.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/HistogramListener.java

  1. … 74 more files in changeset.
SAK-44342 Apply best practice when using ResourceLoader (#8611)

(cherry picked from commit 66e7b3d7d439ac6026e08fb6a7adc8f5a1974d74)

Conflicts:

msgcntr/messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/ui/PrivateMessageManagerImpl.java

msgcntr/messageforums-component-impl/src/webapp/WEB-INF/components.xml

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java

  1. … 75 more files in changeset.
SAK-44342 Apply best practice when using ResourceLoader (#8611)

  1. … 76 more files in changeset.
SAK-44342 Apply best practice when using ResourceLoader (#8611)

(cherry picked from commit 66e7b3d7d439ac6026e08fb6a7adc8f5a1974d74)

  1. … 76 more files in changeset.
SAK-43568

(cherry picked from commit 5640d3fe0fc58eadcb723be9e16dbaf90c92af54)

SAK-43110 show rubric button when in lessons -> samigo (#8054)

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

(cherry picked from commit 5e90370fda8976e8b3bb440f721ce0e43cc124c3)

  1. … 5 more files in changeset.
SAK-43110 show rubric button when in lessons -> samigo (#8054)

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

(cherry picked from commit 5e90370fda8976e8b3bb440f721ce0e43cc124c3)

Conflicts:

rubrics/impl/src/main/java/org/sakaiproject/rubrics/logic/RubricsServiceImpl.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java

  1. … 5 more files in changeset.
SAK-43110 show rubric button when in lessons -> samigo (#8054)

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

  1. … 5 more files in changeset.
SAK-43239 reduce bad time manipulation code (#7906)

  1. … 34 more files in changeset.
SAK-43239 reduce bad time manipulation code (#7906)

(cherry picked from commit 7cdaa67a7fb9ba7e3290848fae531bea78c734f5)

  1. … 34 more files in changeset.
SAK-43239 reduce bad time manipulation code (#7906)

(cherry picked from commit 7cdaa67a7fb9ba7e3290848fae531bea78c734f5)

  1. … 34 more files in changeset.
SAK-41737 T&Qs hide link for audio recording if attempts exceeded (#7006)

  1. … 2 more files in changeset.
SAK-41737 T&Qs hide link for audio recording if attempts exceeded (#7006)

(cherry picked from commit 9728958baa8b0f91c38713f68b02f54bb83a50e9)

  1. … 2 more files in changeset.
SAK-41876 Only process a null action if student (#6975)

SAK-41876 Only process a null action if student (#6975)

(cherry picked from commit cf2d100fd85964cd20ced5881a53faf11d6afeeb)

SAK-41876 Only process a null action if student (#6975)

(cherry picked from commit cf2d100fd85964cd20ced5881a53faf11d6afeeb)

SAK-41150 Allow previewing tests from lessons (#6600)

  1. … 1 more file in changeset.
SAK-41150 Allow previewing tests from lessons (#6600)

(cherry picked from commit 7a6b00637f1ba9618eb08b081a87ea24fb75e0fb)

  1. … 1 more file in changeset.
SAK-41150 Allow previewing tests from lessons (#6600)

(cherry picked from commit 7a6b00637f1ba9618eb08b081a87ea24fb75e0fb)

  1. … 1 more file in changeset.
SAK-40523 - Samigo: Cannot save assessment work from URL takes (#6186)

  1. … 8 more files in changeset.
SAK-40523 - Samigo: Cannot save assessment work from URL takes (#6186)

(cherry picked from commit a3f2b0b39e90b39edb7490b22ae516868795c1a1)

  1. … 8 more files in changeset.
SAK-40784 commons-lang => commons-lang3

org.apache.commons.lang.StringUtils => org.apache.commons.lang3.StringUtils;

org.apache.commons.lang.StringEscapeUtils = org.apache.commons.text.StringEscapeUtils

StringEscapeUtils.escapeXml10(String)

org.apache.commons.lang.BooleanUtils => org.apache.commons.lang3.BooleanUtils;

  1. … 57 more files in changeset.
SAK-40747: Samigo > can take quiz via /direct URL without required permissions (#6113)

  1. … 5 more files in changeset.
SAK-40747: Samigo > can take quiz via /direct URL without required permissions (#6113)

(cherry picked from commit 50826fc8236a12a0c3544ec048abd7f1bf109c67)

  1. … 5 more files in changeset.
SAK-39940 Audio question in Samigo delivery should be inline like other questions (#5575)

  1. … 10 more files in changeset.
SAK-39940 Audio question in Samigo delivery should be inline like other questions (#5575)

  1. … 10 more files in changeset.
SAK-39974 - UploadAudioMediaServlet: Problems with file separators in Windows environments

SAK-39974 - UploadAudioMediaServlet: Problems with file separators in Windows environments

SAK-39974 - UploadAudioMediaServlet: Problems with file separators in Windows environments