Sam Ottenhoff

SAK-43621 soft-delete student submission by modifying STATUS flag (#8201)

SAK-34190 allow deleting a published assessment with submissions (#8200)

* SAK-34190 allow deleting a published assessment with submissions as we now have restoration capabilities

* Removed hard deletion of rubric evaluations when soft deleting associations

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

SAK-34190 allow deleting a published assessment with submissions (#8200)

* SAK-34190 allow deleting a published assessment with submissions as we now have restoration capabilities

* Removed hard deletion of rubric evaluations when soft deleting associations

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

(cherry picked from commit fc87db778d2a79893b55be4e78370430f68a519f)

SAK-43615 handle bad timezone like EST/PST/HST and remove confusing ETC timezones (#8202)

SAK-43365 sync of help content from Screensteps for Sakai 20 (#8194)

  1. … 544 more files in changeset.
SAK-43365 sync of help content from Screensteps for Sakai 20 (#8194)

(cherry picked from commit ef6525bd2a22723b8d0b8ad9d0665c247af63f6c)

  1. … 544 more files in changeset.
SAK-43573 make compression level configurable (#8163)

(cherry picked from commit 5a79be5ed0e52c08a356080ee2d687d4d8ba4889)

SAK-43573 make compression level configurable (#8163)

SAK-43573 make compression level configurable (#8163)

(cherry picked from commit 5a79be5ed0e52c08a356080ee2d687d4d8ba4889)

SAK-43567 record an event when instructor deletes submission (#8157)

(cherry picked from commit 60f306327aa6679ad40415715a2f425a40387730)

SAK-43567 record an event when instructor deletes submission (#8157)

SAK-43567 record an event when instructor deletes submission (#8157)

(cherry picked from commit 60f306327aa6679ad40415715a2f425a40387730)

SAK-43347 remove more traces of JLDAP (#7990)

SAK-41324 only display info on ES nodes that actually hold data (#7966)

SAK-43340 search against all fields not just contents (#7952)

* SAK-43340 search against all fields not just contents

* use the simpleQueryString even better

* add a test case

(cherry picked from commit 855b66a7115b4e65dcdecbfc36ed933ecd2758ec)

SAK-43340 search against all fields not just contents (#7952)

* SAK-43340 search against all fields not just contents

* use the simpleQueryString even better

* add a test case

SAK-43340 search against all fields not just contents (#7952)

* SAK-43340 search against all fields not just contents

* use the simpleQueryString even better

* add a test case

(cherry picked from commit 855b66a7115b4e65dcdecbfc36ed933ecd2758ec)

Conflicts:

search/elasticsearch/util/src/java/org/sakaiproject/search/elasticsearch/BaseElasticSearchIndexBuilder.java

SAK-42992 fix bad merge into 19.x related to feedbackEndDate (new feature in 20+)

SAK-43287 fix error around integer parsing (#7943)

(cherry picked from commit 34b362a8920e0e41925c6cead24f1db6e57fe04b)

    • -20
    • +6
    /lessonbuilder/tool/src/webapp/js/show-page.js
SAK-43287 fix error around integer parsing (#7943)

    • -20
    • +6
    /lessonbuilder/tool/src/webapp/js/show-page.js
Fix parsing of date picker dates (#7920)

(cherry picked from commit 2b6ad91db39fd09b0ac5f8ac705646b30be6ef47)

Fix parsing of date picker dates (#7920)

SAK-42991 remove more timezone display manipulation in Samigo (#7923)

SAK-42991 remove more timezone display manipulation in Samigo (#7923)

(cherry picked from commit ad25f3f3a59ae11db5fd60afd805251a39a3a58b)

SAK-42991 remove more timezone display manipulation in Samigo (#7923)

(cherry picked from commit ad25f3f3a59ae11db5fd60afd805251a39a3a58b)

Conflicts:

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/PublishedAssessmentSettingsBean.java

SAK-43117 use the JSF timeZone attribute to set the current time in user's preferred timezone (#7913)

This reverts commit d3eebe31364ebefee864eb58cdaf700cbb07c76f.

SAK-43117 use the JSF timeZone attribute to set the current time in user's preferred timezone (#7913)

This reverts commit d3eebe31364ebefee864eb58cdaf700cbb07c76f.

(cherry picked from commit 3d5d064ab6cd6276cbeb1bf58ee77e9fad0d507f)

SAK-43239 reduce bad time manipulation code (#7906)

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

(cherry picked from commit 7cdaa67a7fb9ba7e3290848fae531bea78c734f5)

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

(cherry picked from commit 7cdaa67a7fb9ba7e3290848fae531bea78c734f5)

  1. … 20 more files in changeset.