Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Revert "SAK-44504 Add multiple assessment protection to client (#8710)" (#8767)

This reverts commit 5feab82d8ddbe639ac74deab596264d30b6e3131.

  1. … 3 more files in changeset.
Revert "SAK-44504 Add multiple assessment protection to client (#8710)"

This reverts commit 5feab82d8ddbe639ac74deab596264d30b6e3131.

  1. … 3 more files in changeset.
SAK-44504 Add multiple assessment protection to client (#8710)

https://jira.sakaiproject.org/browse/SAK-44504

This adds some client side protection to try and prevent users from

working on different Samigo assessments at the same time. Hopefully

this will reduce incidences of the Data Discrepancy error.

  1. … 3 more files in changeset.
SAK-43088 Samigo set cascading with orphan removal for Item's (#7904)

* SAK-43088 Samigo set cascading with orphan removal for Item

This PR also reverted the following recent fixes as the root of this

issue was traced back to SAK-42116

Reverts SAK-43107 SAK-43123 SAK-42901 SAK-42853 SAK-42858 SAK-42116

(cherry picked from commit 050502b685177ad8e11f4566d06086b2e7cefbad)

Conflicts:

samigo/samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/PublishedItemData.hbm.xml

  1. … 18 more files in changeset.
SAK-43088 Samigo set cascading with orphan removal for Item's (#7904)

* SAK-43088 Samigo set cascading with orphan removal for Item

This PR also reverted the following recent fixes as the root of this

issue was traced back to SAK-42116

Reverts SAK-43107 SAK-43123 SAK-42901 SAK-42853 SAK-42858 SAK-42116

(cherry picked from commit 050502b685177ad8e11f4566d06086b2e7cefbad)

  1. … 18 more files in changeset.
SAK-43088 Samigo set cascading with orphan removal for Item's (#7904)

* SAK-43088 Samigo set cascading with orphan removal for Item

This PR also reverted the following recent fixes as the root of this

issue was traced back to SAK-42116

Reverts SAK-43107 SAK-43123 SAK-42901 SAK-42853 SAK-42858 SAK-42116

  1. … 18 more files in changeset.
SAK-42901 Lock portions of mcq items if submissions exist (#7811)

* SAK-42901 Lock portions of mcq items if submissions exist

https://jira.sakaiproject.org/browse/SAK-42901

* delete comment

Co-authored-by: Sam Ottenhoff <ottenhoff@longsight.com>

  1. … 11 more files in changeset.
SAK-42901 Lock portions of mcq items if submissions exist (#7811)

* SAK-42901 Lock portions of mcq items if submissions exist

https://jira.sakaiproject.org/browse/SAK-42901

* delete comment

Co-authored-by: Sam Ottenhoff <ottenhoff@longsight.com>

(cherry picked from commit f7e4aa4ad389aacf00adff3f07bea976e78bfa9a)

  1. … 11 more files in changeset.
SAK-42901 Lock portions of mcq items if submissions exist (#7811)

* SAK-42901 Lock portions of mcq items if submissions exist

https://jira.sakaiproject.org/browse/SAK-42901

* delete comment

Co-authored-by: Sam Ottenhoff <ottenhoff@longsight.com>

(cherry picked from commit f7e4aa4ad389aacf00adff3f07bea976e78bfa9a)

  1. … 11 more files in changeset.
SAK-42865 T&Qs : copy from pool option appears twice (#7650)

Also cleaned up code on related java file

(cherry picked from commit 3ca6c2134d4ed790194a81443288db87ad3050a6)

  1. … 1 more file in changeset.
SAK-42865 T&Qs : copy from pool option appears twice (#7650)

Also cleaned up code on related java file

  1. … 1 more file in changeset.
SAK-42183 Samigo: Standardized banners and replaced the messageSamigo banners as well (#7154)

* SAK-42183 Samigo: Standardized banners and replaces the messageSamigo ones

* SAK-42183 fixed typo

* SAK-42183 Resolved some errors

* resolved conflicts within samigo/samigo-app/src/webapp/jsf/template/templateIndex.jsp

  1. … 60 more files in changeset.
SAK-34741 SAKAI-2735 SAM-1113 Ability to flag question as Extra Credit (#7060)

* SAK-34741 SAKAI-2735 SAM-1113 Ability to flag question as Extra Credit

This allows instructors to flag questions in their assessment as extra credit. Extra credit questions

will not count towards the total possible points for an assessment. However, any points earned by the

student for answering the extra credit question correctly will be added to their total earned points

for that assessment. Currently, students are able to score over 100 percent on an assessment.

  1. … 39 more files in changeset.
SAK-41217 - Samigo: Questions worth over 1000 points display with a comma in the student view when taking quiz (#6500)

(cherry picked from commit 29c17f2fccee027d5d2cc09e19bc35d5dfa7baf7)

  1. … 15 more files in changeset.
SAK-41217 - Samigo: Questions worth over 1000 points display with a comma in the student view when taking quiz (#6500)

  1. … 15 more files in changeset.
SAK-40605 Samigo class cast on update order button for published assessments (#6315)

(cherry picked from commit cddb065a561335ebc0b37cba609cbad999b2b800)

  1. … 18 more files in changeset.
SAK-40605 Samigo class cast on update order button for published assessments (#6315)

  1. … 18 more files in changeset.
SAK-40605 Samigo class cast on update order button for published assessments (#6315)

(cherry picked from commit cddb065a561335ebc0b37cba609cbad999b2b800)

Conflicts:

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ActionSelectListener.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/StudentScoreAttachmentListener.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/StudentScoreListener.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/StudentScoreUpdateListener.java

samigo/samigo-app/src/webapp/jsf/author/editAssessment.jsp

  1. … 17 more files in changeset.
SAK-34177: Samigo > fix poor placement of add questions drop-downs on quiz edit screen

  1. … 4 more files in changeset.
SAK-34177: Samigo > fix poor placement of add questions drop-downs on quiz edit screen

(cherry picked from commit ebdf7775bfcc32af954242aa2411795e925e5a40)

  1. … 4 more files in changeset.
SAK-32491 Library: Redesigned and standardized the design and states of Sakai buttons; introduced primary and secondary action buttons (#6057)

  1. … 85 more files in changeset.
SAK-40448 Samigo JSF upgrade from 1.2_15-06 to 2.3.5 (#5872)

  1. … 121 more files in changeset.
SAK-38408 hide the empty links so screenreader doesnt announce (#5703)

  1. … 1 more file in changeset.
SAK-38408 hide the empty links so screenreader doesnt announce (#5703)

(cherry picked from commit f0c0f1015ced981c55f7025c1e8f97d4655c7267)

  1. … 1 more file in changeset.
SAK-38418 add a label to samigo points (#5622)

  1. … 1 more file in changeset.
SAK-38397 use a label on the part number dropdown (#5620)

SAK-34049 Rubrics Add an indicator to items that use a Rubric

(cherry picked from commit a096a4e4e2188759a468e7864ea784ed70cb70da)

  1. … 17 more files in changeset.
SAM-3372 Resolving minor UI fixes (#5400)

  1. … 3 more files in changeset.
SAM-3372 Samigo main screen redesign (#5377)

* SAM-3372 Samigo main screen redesign

* SAM-3372 Requested changes on Samigo main screen redesign

  1. … 53 more files in changeset.
SAM-3339: Load JS/CSS via CDN (#5180)

(cherry picked from commit a740b405a090f34ea825f8278ef3bf485f979c7b)

  1. … 28 more files in changeset.