Clone
 

sam ottenhoff <ottenhoff@longsight.com> in Sakai.Git

SAK-45599 add weighted rubric help (#9363)

SAK-45599 updated help files (#9348)

  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)

SAK-45193 display less info during error reporting (#2)

(cherry picked from commit 33d80af65709da5fb8d0f2a3201c3395c6738f0c)

SAK-45509 better handle legacy questions and factorial (#9263)

SAK-45509 better handle legacy questions and factorial (#9263)

(cherry picked from commit d300dc4bf6186a3ea21dd22d930598b774e551f4)

SAK-45509 better handle legacy questions and factorial (#9263)

(cherry picked from commit d300dc4bf6186a3ea21dd22d930598b774e551f4)

SAK-33621 part II making audio recorder work when multiple questions on one page (#9213)

(cherry picked from commit 5d4d34632ffca239c72f7519c2d632d05de2cdb3)

    • -65
    • +63
    /library/src/webapp/js/sakai-recorder.js
    • -22
    • +22
    /samigo/samigo-app/src/webapp/css/tool_sam.css
SAK-33621 part II making audio recorder work when multiple questions on one page (#9213)

(cherry picked from commit 5d4d34632ffca239c72f7519c2d632d05de2cdb3)

Conflicts:

samigo/samigo-app/src/webapp/css/tool_sam.css

    • -65
    • +63
    /library/src/webapp/js/sakai-recorder.js
    • -25
    • +25
    /samigo/samigo-app/src/webapp/css/tool_sam.css
SAK-33621 part II making audio recorder work when multiple questions on one page (#9213)

    • -65
    • +63
    /library/src/webapp/js/sakai-recorder.js
    • -22
    • +22
    /samigo/samigo-app/src/webapp/css/tool_sam.css
SAK-41358 20.x help file update (#9197)

    • -375
    • +3979
    /help/help-tool/src/webapp/css/help.css
    • -27
    • +62
    /help/help-tool/src/webapp/html/help.html
  1. … 541 more files in changeset.
SAK-44497 audit log should use database-stored username instead of looking up user info (#9182)

(cherry picked from commit 3dbdbfbc46643316c827e0b0b22132cbb7be92bb)

Conflicts:

site-manage/site-manage-impl/impl/src/bundle/UserAuditService.properties

userauditservice/tool/src/java/org/sakaiproject/userauditservice/tool/UserAuditEventLog.java

SAK-44497 audit log should use database-stored username instead of looking up user info (#9182)

(cherry picked from commit 3dbdbfbc46643316c827e0b0b22132cbb7be92bb)

Conflicts:

userauditservice/tool/src/java/org/sakaiproject/userauditservice/tool/UserAuditEventLog.java

SAK-44497 audit log should use database-stored username instead of looking up user info (#9182)

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

(cherry picked from commit 6c209ab8b6c3d6d539342597ee8516c8c0d5926a)

Conflicts:

samigo/samigo-app/src/webapp/jsf/delivery/item/deliverAudioRecording.jsp

  1. … 11 more files in changeset.
SAK-33621 remove Flash fallback in audio recorder, use library for waveform rendering (#9061)

(cherry picked from commit 6c209ab8b6c3d6d539342597ee8516c8c0d5926a)

  1. … 11 more files in changeset.
SAK-33621 remove Flash fallback in audio recorder, use library for waveform rendering (#9061)

  1. … 11 more files in changeset.
SAK-28047 use IBM437 because it seems to be Windows default (#9165)

(cherry picked from commit 21957bbe6269794888741927ec76d7f049d69105)

SAK-28047 use IBM437 because it seems to be Windows default (#9165)

(cherry picked from commit 21957bbe6269794888741927ec76d7f049d69105)

SAK-28047 use IBM437 because it seems to be Windows default (#9165)

SAK-28047 test multiple charsets for uploaded ZIP (#9152)

(cherry picked from commit b2d40e343d5979d30e5b8f9a76c92b0f04f1be05)

SAK-28047 test multiple charsets for uploaded ZIP (#9152)

SAK-28047 test multiple charsets for uploaded ZIP (#9152)

(cherry picked from commit b2d40e343d5979d30e5b8f9a76c92b0f04f1be05)

SAK-45240 clean up bad tagList interaction with Hibernate (#9139)

SAK-45240 clean up bad tagList interaction with Hibernate (#9139)

(cherry picked from commit ca8d86f49915c99f52ffc1735aff0638118ac51c)

SAK-45240 clean up bad tagList interaction with Hibernate (#9139)

(cherry picked from commit ca8d86f49915c99f52ffc1735aff0638118ac51c)

SAK-45240 clean up bad tagList interaction with Hibernate (#9139)

(cherry picked from commit ca8d86f49915c99f52ffc1735aff0638118ac51c)