Sam Ottenhoff

SAK-43994 fix assignment gb category logic with equal-weight categories (#9469)

SAK-45827 sakai.forums default help (#9470)

SAK-45733 allow substitution of user timezone (#9428)

SAK-43648 msgcntr duplicate topic not saving custom permissions (#9442)

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

(cherry picked from commit 7def661604d3ffaad3d034803369d7f6b1a85266)

SAK-43648 msgcntr duplicate topic not saving custom permissions (#9442)

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

SAK-43648 msgcntr duplicate topic not saving custom permissions (#9442)

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

(cherry picked from commit 7def661604d3ffaad3d034803369d7f6b1a85266)

SAK-45728 remove clear filter fake button (#9441)

tabs

SAK-45690 stop file conversion processing after 5 attempts (#9406)

Revert "SAK-33621 remove Flash fallback in audio recorder, use library for waveform rendering (#9061)"

This reverts commit d95997077ad401f20914bf35a3d04c2e5b9a270f.

  1. … 11 more files in changeset.
Revert "SAK-33621 part II making audio recorder work when multiple questions on one page (#9213)"

This reverts commit 73986fea34bd6bdd11f173bd107bf50ebdfd3607.

    • -63
    • +65
    /library/src/webapp/js/sakai-recorder.js
    • -25
    • +25
    /samigo/samigo-app/src/webapp/css/tool_sam.css
SAK-45691 re-do the way FileConversionService creates attachment names (#9407)

* SAK-45691 re-do the way FileConversionService creates attachment names

* Added content.hidden to the advisor

Co-authored-by: Adrian Fish <adrian.r.fish@gmail.com>

(cherry picked from commit 9c5c79780ff09147831c90d9d7342bc907855950)

SAK-45691 re-do the way FileConversionService creates attachment names (#9407)

* SAK-45691 re-do the way FileConversionService creates attachment names

* Added content.hidden to the advisor

Co-authored-by: Adrian Fish <adrian.r.fish@gmail.com>

SAK-45678 fix up loading of jquery on page load (#9403)

SAK-45671 gradebookng should use UserTimeService for dates (#9396)

(cherry picked from commit 462f2f033c208fe8586718e5b9ca9d434ad9a8c0)

Conflicts:

gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/GradebookNgBusinessService.java

SAK-45671 gradebookng should use UserTimeService for dates (#9396)

(cherry picked from commit 462f2f033c208fe8586718e5b9ca9d434ad9a8c0)

SAK-45671 gradebookng should use UserTimeService for dates (#9396)

SAK-45647 the DateFormatter needs to be timezone adjusted (#9375)

SAK-45647 the DateFormatter needs to be timezone adjusted (#9375)

(cherry picked from commit 589b80d2b73836843c7adeafed20f792b8fccdcc)

SAK-45628 NPE protection (#9374)

(cherry picked from commit cc335364bc092238a5a757313383da4df173e7a4)

Co-authored-by: Brian Jones <bjones86@uwo.ca>

(cherry picked from commit 64b110c4d270246d4f8f8f9ff4c5c4672ad8a821)

Conflicts:

site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java

SAK-45628 NPE protection (#9374)

(cherry picked from commit cc335364bc092238a5a757313383da4df173e7a4)

Co-authored-by: Brian Jones <bjones86@uwo.ca>

(cherry picked from commit 64b110c4d270246d4f8f8f9ff4c5c4672ad8a821)

SAK-45628 NPE protection (#9374)

(cherry picked from commit cc335364bc092238a5a757313383da4df173e7a4)

Co-authored-by: Brian Jones <bjones86@uwo.ca>

SAK-45599 add weighted rubric help (#9363)

(cherry picked from commit a37c546ac7d8f54f621ec33fa27c11b2a5cd9cc3)

SAK-45599 add weighted rubric help (#9363)

SAK-45599 updated help files (#9348)

  1. … 169 more files in changeset.
SAK-45599 updated help files (#9348)

(cherry picked from commit 9b1613a171b8b5e90eaed5caf8784e844c3c2998)

  1. … 169 more files in changeset.
SAK-45523

(cherry picked from commit c457d3c091cd0ac6c195d1253f72aee3a6eaa7d5)

(cherry picked from commit 1d924949777507bca33d0c8d1107b16d1c67a6fe)

SAK-45523

(cherry picked from commit c457d3c091cd0ac6c195d1253f72aee3a6eaa7d5)

(cherry picked from commit 1d924949777507bca33d0c8d1107b16d1c67a6fe)

SAK-45523

(cherry picked from commit c457d3c091cd0ac6c195d1253f72aee3a6eaa7d5)

(cherry picked from commit 1d924949777507bca33d0c8d1107b16d1c67a6fe)

SAK-45523

(cherry picked from commit c457d3c091cd0ac6c195d1253f72aee3a6eaa7d5)