Clone
 

david p. bauer <davidpbauer@users.noreply.github.com> in Sakai.Git

SAK-45539 Only include twitter.js if page has embedded timeline (#9296)

SAK-44785 Fix deliver assessment jsf template (#9290)

SAK-44785 Add "direct-upload" endpoint to content entity provider (#8977)

This adds a new endpoint that allows members of a site to upload a file

to resources whether or not they have permission to do so. Those without

permission will have their file sent to a folder called by default

student-uploads. Those with permission to add a resource will be have theirs

sent to instructor-uploads.

This endpoint is diabled by default and can be enabled by setting the sakai

property content.direct.upload.enabled=true. Additionally, the direct-upload

folder names can be overriden in sakai.properties.

This new endpoint integrates with the CKEditor to provide drag and drop embedding

and image upload capabilities.

SAK-45370 Update calc q regex to avoid catastrophic backtracking (#9229)

Convert non-greedy regular expression pattern for a calculated question

calculation to possessive version to avoid backtracking that can cause

stackoverflow errors or CPU load bring down the system.

Added test for backtracking.

(cherry picked from commit 686103b2e5f124ead9b74bbacca4e0841ab4b061)

SAK-45370 Update calc q regex to avoid catastrophic backtracking (#9229)

Convert non-greedy regular expression pattern for a calculated question

calculation to possessive version to avoid backtracking that can cause

stackoverflow errors or CPU load bring down the system.

Added test for backtracking.

(cherry picked from commit 686103b2e5f124ead9b74bbacca4e0841ab4b061)

SAK-45370 Update calc q regex to avoid catastrophic backtracking (#9229)

Convert non-greedy regular expression pattern for a calculated question

calculation to possessive version to avoid backtracking that can cause

stackoverflow errors or CPU load bring down the system.

Added test for backtracking.

SAK-44995 Remove rudy color theme from lessons and fix navy subpage buttons (#9238)

(cherry picked from commit 872b6f3a7dd8daeeee81b82b9a09207434499c25)

SAK-44995 Remove rudy color theme from lessons and fix navy subpage buttons (#9238)

SAK-45464 Swap labels for add web links input fields (#9239)

SAK-45464 Swap labels for add web links input fields (#9239)

(cherry picked from commit a4e5dd911df70f8fed99ebb7c24bbe7348346022)

SAK-34249 Extended time dates pulled from wrong published assessment (#9100)

Ensure extended time service is set to the correct published assessment before

checking exam delivery dates

SAK-34249 Extended time dates pulled from wrong published assessment (#9100)

Ensure extended time service is set to the correct published assessment before

checking exam delivery dates

(cherry picked from commit cda9dc74166acfeb6259ce5df38d80bc61c4d39f)

SAK-34249 Extended time dates pulled from wrong published assessment (#9100)

Ensure extended time service is set to the correct published assessment before

checking exam delivery dates

(cherry picked from commit cda9dc74166acfeb6259ce5df38d80bc61c4d39f)

SAK-34249 Extended time dates pulled from wrong published assessment (#9100)

Ensure extended time service is set to the correct published assessment before

checking exam delivery dates

(cherry picked from commit cda9dc74166acfeb6259ce5df38d80bc61c4d39f)

Conflicts:

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

SAK-38691 Store session start and end timestamp in UTC without time zone (#9106)

Usage Session is using Instant for session start and end which is already

in UTC and stored as such. Timezone is not needed and can cause issues with

DST.

SAK-45119 Fix embedded images with prereqs not showing to students (#9099)

Explicitly set userdirectoryservice, usertimeservice, and authzgroupservice

in simplepagebean when accessed from lessonbuilderaccessservice to prevent

NPEs and returning a 404 when attempting to load the embedded image.

(cherry picked from commit 6f96f03e5167edbc390d034b448eba2d5046a51f)

SAK-45119 Fix embedded images with prereqs not showing to students (#9099)

Explicitly set userdirectoryservice, usertimeservice, and authzgroupservice

in simplepagebean when accessed from lessonbuilderaccessservice to prevent

NPEs and returning a 404 when attempting to load the embedded image.

SAK-45003 Prevent creation of assessment grading record before open date (#9013)

(cherry picked from commit d43d80a3d8a6ce2555705f03a0de5377dfb750f0)

SAK-45003 Prevent creation of assessment grading record before open date (#9013)

SAK-45003 Prevent creation of assessment grading record before open date (#9013)

(cherry picked from commit d43d80a3d8a6ce2555705f03a0de5377dfb750f0)

SAK-44905 Clean up name and description form field styling (#8975)

Improve the styling of the name and description form fields in the

edit dialog and on the checklist page by adding spacing and making

them wider.

(cherry picked from commit 7292a80ffd3e89e8418441efabb4a4e32a4014ab)

    • -1
    • +0
    /lessonbuilder/tool/src/webapp/css/checklist.css
SAK-44905 Clean up name and description form field styling (#8975)

Improve the styling of the name and description form fields in the

edit dialog and on the checklist page by adding spacing and making

them wider.

    • -1
    • +0
    /lessonbuilder/tool/src/webapp/css/checklist.css
SAK-44557 Remove section and column merge link id from href (#8968)

Section and column break item id is needed in javascript to remove the

section or column. This was added to the href of the link but should instead

be added to a data attribute on the link. Links should instead be buttons

and were changed.

SAK-44557 Remove section and column merge link id from href (#8968)

Section and column break item id is needed in javascript to remove the

section or column. This was added to the href of the link but should instead

be added to a data attribute on the link. Links should instead be buttons

and were changed.

(cherry picked from commit 4ca7d3e5f617e95dafde53c47a377795b08cd983)

SAK-44651 Fix save button on pagepicker for adding existing page to left margin (#8962)

Regression with pagepickerproducer submit workflow from SAK-44159.

SAK-44651 Fix save button on pagepicker for adding existing page to left margin (#8962)

Regression with pagepickerproducer submit workflow from SAK-44159.

(cherry picked from commit fc4ce032d7283b69fd259aab72efb527c00c8eaf)

SAK-44262 Fix rubrics table creation in Oracle (#8692)

rbc_rubric and rbc_criterion were not getting automatically created in Oracle

because the columnDefinition configuration there previously was not compatitble.

This removes that property and instead sets the default values with PrePersist

JPA annotation in rubric and changes double to float in criterion.

(cherry picked from commit 6472d5ed812eb8979c27aaac00b9da58cd3f3efb)

SAK-44262 Fix rubrics table creation in Oracle (#8692)

rbc_rubric and rbc_criterion were not getting automatically created in Oracle

because the columnDefinition configuration there previously was not compatitble.

This removes that property and instead sets the default values with PrePersist

JPA annotation in rubric and changes double to float in criterion.

SAK-44207 Set hibernate.id.new_generator_mappings back to false after Hibernate upgrade (#8691)

The Hibernate 5 upgrade switched hibernate.id.new_generator_mappings to true by default

which made it so sequences set in hbm.xml files with class="native" would not get

created when auto.ddl was set to true to create the schema in a blank database. This

switches the property back to false to maintain the behavior before the Hibernate upgrade.

SAK-44207 Set hibernate.id.new_generator_mappings back to false after Hibernate upgrade (#8691)

The Hibernate 5 upgrade switched hibernate.id.new_generator_mappings to true by default

which made it so sequences set in hbm.xml files with class="native" would not get

created when auto.ddl was set to true to create the schema in a blank database. This

switches the property back to false to maintain the behavior before the Hibernate upgrade.

(cherry picked from commit e266c056f1daab0b873f81676f812b4ca813c5eb)