Clone
 

curtis van osch <curtis.vo@gmail.com> in Sakai.Git

SAK-36801: add validation and replace commas by periods (#9372)

    • -0
    • +71
    /samigo/samigo-app/src/webapp/js/calcQuestInputValidator.js
    • -0
    • +11
    /samigo/samigo-app/src/webapp/js/delivery.js
SAK-45537: secure content wrapper missing for two question types (#9483)

* SAK-45537: secure content wrapper missing for two question types

* Also missing for part description

SAK-44433 Samigo fix score adjustment validation on question totals page (#8685)

SAK-44433 Samigo fix score adjustment validation on question totals page (#8685)

(cherry picked from commit e91848dd6ae6fc7e576b0ac28a436ff92a10cf91)

SAK-43781: define system property elsewhere in case ical import is disabled (#8284)

SAK-42721: check that assignment url is not empty string (#7622)

* SAK-42721: check that assignment url is not empty string

SAK-42721: check that assignment url is not empty string (#7622)

* SAK-42721: check that assignment url is not empty string

(cherry picked from commit d8114ba2f09fb97deab9d4ca6df4ee4a61d067f7)

SAK-42721: check that assignment url is not empty string (#7622)

* SAK-42721: check that assignment url is not empty string

(cherry picked from commit d8114ba2f09fb97deab9d4ca6df4ee4a61d067f7)

Conflicts:

portal/portal-api/api/src/java/org/sakaiproject/portal/beans/bullhornhandlers/GradeAssignmentBullhornHandler.java

SAK-40753: i18n reminder email (#7240)

* SAK-40753: i18n reminder email

* date format should be same as before

SAK-40753: i18n reminder email (#7240)

* SAK-40753: i18n reminder email

* date format should be same as before

(cherry picked from commit ec2b5ac4f7c09a922194c2a76d406180539a2968)

SAK-41685: propagate IdUnusedException if the site does not exist so … (#6822)

* SAK-41685: propagate IdUnusedException if the site does not exist so it can be handled

* Propagate PermissionException also

SAK-42021: Only create bullhorn alert for members of the groups (#7196)

* SAK-42021: Only create bullhorn alert for members of the groups

* diamond operator

(cherry picked from commit d4143095fa55973498b144506648eb738163a3b7)

SAK-42021: Only create bullhorn alert for members of the groups (#7196)

* SAK-42021: Only create bullhorn alert for members of the groups

* diamond operator

SAK-42152: don't need to queue the inline text here because it is added to the list of documents and queued later also (#7130)

(cherry picked from commit 729064174e7308fbcfccf8ed01c15dcdd79b4a43)

SAK-42152: don't need to queue the inline text here because it is added to the list of documents and queued later also (#7130)

SAK-42152: don't need to queue the inline text here because it is added to the list of documents and queued later also (#7130)

(cherry picked from commit 729064174e7308fbcfccf8ed01c15dcdd79b4a43)

SAK-41681: invalidate the cached children when one is added/removed f… (#6965)

* SAK-41681: invalidate the cached children when one is added/removed from the list

* Init mock cache before calling addNode/removeNode, expect remove call to mocked cache

SAK-41700: fix hardcoded text (#6834)

(cherry picked from commit 98029d70cdac279e96e120ec78d389a9e71f0ce4)

SAK-41700: fix hardcoded text (#6834)

SAK-33638: remove the STATE_HARD_DELETE state attribute to allow soft delete after accepting or cancelling a hard delete (#6543)

(cherry picked from commit 026ff108e1fb8d0c3622851d0d848a015f2481c7)

SAK-33638: remove the STATE_HARD_DELETE state attribute to allow soft delete after accepting or cancelling a hard delete (#6543)

SAK-41032: change "Due" header message key (#6335)

(cherry picked from commit ca5f9b038ef830db336f6a3f99466575644c6667)

  1. … 6 more files in changeset.
SAK-41032: change "Due" header message key (#6335)

  1. … 6 more files in changeset.