Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-40738 CKEditor autosave alerts about saved text for ckeditor other than the one that originated the autosave (#9857)

  1. … 53 more files in changeset.
SAK-45074 Samigo : add missing library for previous commit (#9762)

See https://github.com/sakaiproject/sakai/pull/9656

(cherry picked from commit 55d8018e9ca18e1f020fd2a9450a71c87adb65b4)

Conflicts:

samigo/samigo-app/src/webapp/jsf/author/item/matching.jsp

SAK-45074 Samigo : add missing library for previous commit (#9762)

See https://github.com/sakaiproject/sakai/pull/9656

(cherry picked from commit 55d8018e9ca18e1f020fd2a9450a71c87adb65b4)

SAK-45074 Samigo : add missing library for previous commit (#9762)

See https://github.com/sakaiproject/sakai/pull/9656

SAK-45074 Samigo : disable matching button on submit (#9656)

Also removing unused translation key

(cherry picked from commit 6780138f129b660519821a974e1fd83c95298e9c)

Conflicts:

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_ar.properties

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_de_DE.properties

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_tr_TR.properties

  1. … 12 more files in changeset.
SAK-45074 Samigo : disable matching button on submit (#9656)

Also removing unused translation key

  1. … 15 more files in changeset.
SAK-45074 Samigo : disable matching button on submit (#9656)

Also removing unused translation key

(cherry picked from commit 6780138f129b660519821a974e1fd83c95298e9c)

  1. … 15 more files in changeset.
SAK-41964 - Tests&Quizzes: Edit Question form fields are not associated with their respective labels (#8064)

  1. … 15 more files in changeset.
SAK-41964 - Tests&Quizzes: Edit Question form fields are not associated with their respective labels (#8064)

(cherry picked from commit e984a386330ae35908c566f6d7c1acb13bb00263)

  1. … 15 more files in changeset.
NOJIRA: Remove redundant type='text/javascript' from imports in Samigo (#7804)

  1. … 55 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-41369: SAMIGO: Wrong CSS on matching questions (#6576)

  1. … 3 more files in changeset.
SAK-41369: SAMIGO: Wrong CSS on matching questions (#6576)

(cherry picked from commit f7f47a98af5034ad00d844189fd8f23b546f1a70)

  1. … 3 more files in changeset.
SAK-40174 Only allow Rubrics for T&Qs manually graded questions

Rubrics options will appear for these types:

- Short answer.

- Audio recording.

- File upload.

(cherry picked from commit a0b1321cbe1df7ca12ae1f369ed236d0657ceaf6)

  1. … 8 more files in changeset.
SAK-40174 Only allow Rubrics for T&Qs manually graded questions

Rubrics options will appear for these types:

- Short answer.

- Audio recording.

- File upload.

  1. … 8 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-34049 Rubrics Integration with Samigo

(cherry picked from commit 2ed5ca5a1bdfdd1315c9e84fd5e4772b85324dc2)

  1. … 39 more files in changeset.
SAM-3387: remove selection level feedback for distractors in matching questions to avoid loss of user data

  1. … 3 more files in changeset.
SAM-3387: remove selection level feedback for distractors in matching questions to avoid loss of user data

(cherry picked from commit 896eff65b1a0a7a42577f5f8cf84863a25aea720)

Conflicts:

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

  1. … 3 more files in changeset.
SAM-3115 Tags and search in Samigo (#4090)

  1. … 186 more files in changeset.
SAM-2843 Create Matching question screen. Add Bootstrap. Large screens

Changed display for large resolutions

  1. … 1 more file in changeset.
SAM-2843 Create Matching question screen. Add Bootstrap. Large screens

Changed display for large resolutions

  1. … 1 more file in changeset.
SAM-2830 Create Matching question screen. Add Bootstrap

SAM-2830 Create Matching question screen. Add Bootstrap

SAM-2731 Negative points feature was always disable

There are 3 competing features in samigo:

- Partial credit

- Negative Points

- Minimum Points

It would appear that these features were not meant to be used together,

in this change the negative points feature is disabled when on of the other 2

features is enabled.

  1. … 15 more files in changeset.
SAM-2731 Negative points feature was always disable

There are 3 competing features in samigo:

- Partial credit

- Negative Points

- Minimum Points

It would appear that these features were not meant to be used together,

in this change the negative points feature is disabled when on of the other 2

features is enabled.

  1. … 15 more files in changeset.
SAM-2650 more use of JSF label to provide better errors

  1. … 11 more files in changeset.
SAM-2650 more use of JSF label to provide better errors

  1. … 11 more files in changeset.
SAM-1200 - Increasing size of various samigo columns

  1. … 19 more files in changeset.
SAM-1200 - Increasing size of various samigo columns

  1. … 19 more files in changeset.