Alejandro Martínez Fernández

SAK-41386 - Delete condition added in SAK-33755 (#7583)

* SAK-41386 - Delete condition added in SAK-33755

* SAK-41386 - Delete condition added in SAK-33755

(cherry picked from commit 5fbcabe700950a70e112a9b4fa9aef99d81cbee2)

SAK-41386 - Delete condition added in SAK-33755 (#7583)

* SAK-41386 - Delete condition added in SAK-33755

* SAK-41386 - Delete condition added in SAK-33755

(cherry picked from commit 5fbcabe700950a70e112a9b4fa9aef99d81cbee2)

SAK-41386 - Delete condition added in SAK-33755 (#7583)

* SAK-41386 - Delete condition added in SAK-33755

* SAK-41386 - Delete condition added in SAK-33755

SAK-40937: add new properties for JGroups communication (#6518)

* SAK-40937: add new properties for JGroups communication

* SAK-40937: Document the default value

* Added some more explanation

SAK-42084: Remove condition (#7089)

(cherry picked from commit 042dc7c29d4e406a7d639181235b490cd5d17794)

SAK-42084: Remove condition (#7089)

SAK-42018: Remove duplicate button and translate button (#7071)

* SAK-42018: Remove duplicate button and translate button

* SAK-42018: Adrian Fish suggestion

* SAK-42018: Codacy suggestion

* SAK-42018: Readability improvements

(cherry picked from commit c22e064f53d11c1986088abdb6fd8972857c3c63)

SAK-42018: Remove duplicate button and translate button (#7071)

* SAK-42018: Remove duplicate button and translate button

* SAK-42018: Adrian Fish suggestion

* SAK-42018: Codacy suggestion

* SAK-42018: Readability improvements

SAK-41998: Update spanish translations (#7050)

(cherry picked from commit 69f0a0632ca01429620ec76100ae6c3c15e1d073)

Conflicts:

assignment/bundles/resources/assignment_es.properties

commons/impl/src/i18n/org/sakaiproject/commons/impl/ui_es.properties

roster2/i18n/src/i18n/org/sakaiproject/roster/i18n/ui_es.properties

rubrics/api/src/main/bundle/org/sakaiproject/rubrics/bundle/Messages_es.properties

    • -0
    • +2
    /basiclti/basiclti-oidc/src/bundle/oidc_es.properties
  1. … 35 more files in changeset.
SAK-41998: Update spanish translations (#7050)

    • -0
    • +2
    /basiclti/basiclti-oidc/src/bundle/oidc_es.properties
  1. … 35 more files in changeset.
SAK-41917: Change headers (#7003)

(cherry picked from commit 161f0a639ed88feda54013cdea4d65a7c9ed56da)

SAK-41917: Change headers (#7003)

SAK-41225: Changes for internationalitation (#6488)

(cherry picked from commit 19e389ec1cfc7046cd0ba9250fb708cc1ffab643)

    • -0
    • +6
    /polls/impl/src/bundle/notifyDeletedOption.properties
    • -0
    • +6
    /polls/impl/src/bundle/notifyDeletedOption_es.properties
SAK-41225: Changes for internationalitation (#6488)

    • -0
    • +6
    /polls/impl/src/bundle/notifyDeletedOption.properties
    • -0
    • +6
    /polls/impl/src/bundle/notifyDeletedOption_es.properties
SAK-33788: Added DejaVuSans font for UTF8 characters as it is in Calendar. (Based on the SAK-21922 patch) (#6388)

    • -164
    • +174
    /rwiki/rwiki-impl/impl/pom.xml
    • -0
    • +1
    /rwiki/rwiki-impl/impl/src/config/fonts/DejaVuSans-Bold.xml
    • -0
    • +1
    /rwiki/rwiki-impl/impl/src/config/fonts/DejaVuSans.xml
  1. … 24 more files in changeset.
SAK-33788: Added DejaVuSans font for UTF8 characters as it is in Calendar. (Based on the SAK-21922 patch) (#6388)

(cherry picked from commit 6707e975c1a9b115ec15f053b454c72e1f2a3550)

Conflicts:

rwiki/rwiki-impl/impl/pom.xml

    • -164
    • +174
    /rwiki/rwiki-impl/impl/pom.xml
    • -0
    • +1
    /rwiki/rwiki-impl/impl/src/config/fonts/DejaVuSans-Bold.xml
    • -0
    • +1
    /rwiki/rwiki-impl/impl/src/config/fonts/DejaVuSans.xml
  1. … 24 more files in changeset.
SAK-41015: Add studentDisplayId value

(cherry picked from commit 7a9b98fb7559ff4762aa826ab7152299562fa584)

SAK-41015: Add studentDisplayId value

(cherry picked from commit 7a9b98fb7559ff4762aa826ab7152299562fa584)

SAK-41015: Add studentDisplayId value

SAK-40966: remove deadl from bundles

(cherry picked from commit 727e874f7eb5e873906519c2da6a34a5b41b5db3)

Conflicts:

assignment/bundles/resources/assignment_eu.properties

SAK-40966: remove deadl from bundles

SAK-40966: Do not translate the event type of assignments when sending to calendar

(cherry picked from commit 1acf8b0f6eeb6e3215941411e9cdbb1df521a6d6)

SAK-40966: Do not translate the event type of assignments when sending to calendar

(cherry picked from commit 1acf8b0f6eeb6e3215941411e9cdbb1df521a6d6)

SAK-40966: Do not translate the event type of assignments when sending to calendar

SAK-40965: Don't translate the CalendarEventType

SAK-40965: Don't translate the CalendarEventType

(cherry picked from commit a23d8d7e2cdfafb1a7c2a228f5aebecb95a64202)

SAK-40965: Translate event type

SAK-40965: Translate event type

(cherry picked from commit 7280d49d9f0ee745e66396690661ede77c13452f)

Sak 34105: Allow several actions based on "gradebook.editAssignments" permission (#5624)

* SAK-34105: Allow Order items based on gradebook.editAssignments

* SAK-34105: Allow Create, configure, delete grade items based on gradebook.editAssignments permission

* SAK-34105: Allow Student Review Mode based on gradebook.editAssignments permission

* SAK-34105: Allow import, export based on gradebook.editAssignments permission

* SAK-34105: Allow configure tool(edit categories, course statistics, grading scale map,...) based on gradebook.editAssignments permission

* SAK-34105: Remove comments

* SAK-34105: Modify the ta redirection based on the gradebook.editAssignments permission

* SAK-34105: Changes suggested by steveswinsburg in PR

Sak 34105: Allow several actions based on "gradebook.editAssignments" permission (#5624)

* SAK-34105: Allow Order items based on gradebook.editAssignments

* SAK-34105: Allow Create, configure, delete grade items based on gradebook.editAssignments permission

* SAK-34105: Allow Student Review Mode based on gradebook.editAssignments permission

* SAK-34105: Allow import, export based on gradebook.editAssignments permission

* SAK-34105: Allow configure tool(edit categories, course statistics, grading scale map,...) based on gradebook.editAssignments permission

* SAK-34105: Remove comments

* SAK-34105: Modify the ta redirection based on the gradebook.editAssignments permission

* SAK-34105: Changes suggested by steveswinsburg in PR

(cherry picked from commit 7cab999e39e45a3f6b1ba9ae58a0d272e1dd315a)