Clone
 

jesús maría méndez pérez <jesus.mendez@ticarum.es> in Sakai.Git

SAK-45281: SAMIGO: Field Markers should be replace on the Mutually exclusive example (#9176)

SAK-45191: LESSONS: Export error NumberException when exporting IMS CC (#9108)

(cherry picked from commit 45c22729920ea986a63b4438959354ae83cebc13)

SAK-45191: LESSONS: Export error NumberException when exporting IMS CC (#9108)

SAK-45281: SAMIGO: Field Markers should be replace on the Mutually exclusive example (#9157)

SAK-45280: SAMIGO: Character & is forbidden as separator on FIB questions (#9150)

SAK-41379: Hot Spot questions don't appear when printing PDF (#6585)

(cherry picked from commit 41b2801a80294ef9d10417bfc971c1b0df288b90)

SAK-41379: Hot Spot questions don't appear when printing PDF (#6585)

(cherry picked from commit 41b2801a80294ef9d10417bfc971c1b0df288b90)

SAK-41379: Hot Spot questions don't appear when printing PDF (#6585)

SAK-41333: Some javascript error on Tests & Quizzes (#6554)

* SAK-41333: Error 1 Some javascript error on Tests & Quizzes

* SAK-41333: Error 2 Some javascript error on Tests & Quizzes

* SAK-41333: Error 3 Some javascript error on Tests & Quizzes

SAK-41333: Some javascript error on Tests & Quizzes (#6554)

* SAK-41333: Error 1 Some javascript error on Tests & Quizzes

* SAK-41333: Error 2 Some javascript error on Tests & Quizzes

* SAK-41333: Error 3 Some javascript error on Tests & Quizzes

(cherry picked from commit 7723d4a83b5851211eb244a6f2cf1b6445ff167c)

SAK-41333: Some javascript error on Tests & Quizzes (#6554)

* SAK-41333: Error 1 Some javascript error on Tests & Quizzes

* SAK-41333: Error 2 Some javascript error on Tests & Quizzes

* SAK-41333: Error 3 Some javascript error on Tests & Quizzes

(cherry picked from commit 7723d4a83b5851211eb244a6f2cf1b6445ff167c)

Conflicts:

samigo/samigo-app/src/webapp/jsf/delivery/assessmentDeliveryTimer.jsp

samigo/samigo-app/src/webapp/jsf/delivery/confirmSubmit.jsp

samigo/samigo-app/src/webapp/jsf/delivery/item/deliverFillInNumeric.jsp

samigo/samigo-app/src/webapp/jsf/delivery/tableOfContents.jsp

samigo/samigo-app/src/webapp/jsf/widget/timerBar/timerbar.js

SAK-29210: Include student profile photo in Assignments (#6599)

* SAK-29210: Include student profile photo in Assignments

* SAK-29210: Include student profile photo in Assignments

SAK-41362: Checkmark assignments only works on English language (#6583)

* SAK-41362: Checkmark assignments only works on English language

* SAK-41362: Checkmark assignments only works on English language

(cherry picked from commit 3efbc205c870cb1c739d642731f444c3a66f761d)

SAK-41362: Checkmark assignments only works on English language (#6583)

* SAK-41362: Checkmark assignments only works on English language

* SAK-41362: Checkmark assignments only works on English language

SAK-41369: SAMIGO: Wrong CSS on matching questions (#6576)

SAK-41369: SAMIGO: Wrong CSS on matching questions (#6576)

(cherry picked from commit f7f47a98af5034ad00d844189fd8f23b546f1a70)

SAK-41361: Assignment: Wrong label on input when overrides grades (#6569)

SAK-41361: Assignment: Wrong label on input when overrides grades (#6569)

(cherry picked from commit f28667c9fe1df352f0c51801b5a656d01a674a10)

SAK-41319: Assignments attachment icon persists if attachment is removed (#6550)

(cherry picked from commit 8776c909c8c4fdacfb64d03df3d8892f2286a9b6)

SAK-41319: Assignments attachment icon persists if attachment is removed (#6550)

SAK-41316: Upload All options error in Assignments with non English characters (#6541)

SAK-41316: Upload All options error in Assignments with non English characters (#6541)

(cherry picked from commit da1215e9993ed3e39a5aa2302b08915982b74a63)

SAK-41176: Not posible to modify and saved a meeting (#6456)

SAK-41176: Not posible to modify and saved a meeting (#6456)

(cherry picked from commit ace405b4efc1961ac0ec7b5877cd901c66c4428f)

SAK-41164: simplepage.delete_comment appears when a student try to delete a comment (#6451)

SAK-41164: simplepage.delete_comment appears when a student try to delete a comment (#6451)

(cherry picked from commit cbd7da88d2888907b18b663a78165df9f6304ea4)

SAK-41164: simplepage.delete_comment appears when a student try to delete a comment (#6451)

(cherry picked from commit cbd7da88d2888907b18b663a78165df9f6304ea4)

SAK-40545: Assignments - Announcement email options don't save (#6438)

SAK-40545: Assignments - Announcement email options don't save (#6438)

(cherry picked from commit 3dc990eba88fb029ba70f65574d9e0f79d21acc2)

SAK-40907: Footer misplaced on Page Differences of Wiki tool (#6271)

(cherry picked from commit c1717b652712d370dc43fca9125d2fada1315c56)