Clone
 

alejandro martinez fernandez <alejandro.martinez@ticarum.es> in Sakai.Git

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)