Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Revert "SAK-43474 TurnitinOC: Localization for Sakai integration (#8228)"

This reverts commit 187858b5f6a1ebf2339856ec6e1343270995b49b.

  1. … 12 more files in changeset.
SAK-43474 TurnitinOC: Localization for Sakai integration (#8228)

Co-authored-by: Bryan Holladay <baholladay@gmail.com>

(cherry picked from commit cd6ae5980318cb813a6811a9b1c1565672b8cb01)

  1. … 12 more files in changeset.
SAK-43319 Fixed various grade types in Grader. (#7975)

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

Reusing Assignments i18n bundle

dialog feedback working ok

inline feedback working

private notes and cancel working better

rubric saving working

Added rubric grader button

fixed date picker

(cherry picked from commit 2d50f7c19fdea4608f400a9e35a6e7daafbf16b5)

Conflicts:

assignment/bundles/pom.xml

    • -22
    • +0
    ./assignment-noti-prefs_ca.properties
    • -22
    • +0
    ./assignment-noti-prefs_es.properties
    • -3
    • +0
    ./assignment-noti-prefs_tr_TR.properties
    • -1018
    • +0
    ./assignment_fa_IR.properties
  1. … 60 more files in changeset.
SAK-43319 Fixed various grade types in Grader. (#7975)

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

Reusing Assignments i18n bundle

dialog feedback working ok

inline feedback working

private notes and cancel working better

rubric saving working

Added rubric grader button

fixed date picker

    • -22
    • +0
    ./assignment-noti-prefs_ca.properties
    • -22
    • +0
    ./assignment-noti-prefs_es.properties
    • -3
    • +0
    ./assignment-noti-prefs_tr_TR.properties
    • -1018
    • +0
    ./assignment_fa_IR.properties
  1. … 61 more files in changeset.
SAK-43212 Assignments : 'missing key' log error (#7881)

It seems that bit of text is managed differently since SAK-33914.

Removing orphaned translation keys too

(cherry picked from commit 9d5fc80317d97b169812a211f93819f56aa75146)

  1. … 1 more file in changeset.
SAK-43212 Assignments : 'missing key' log error (#7881)

It seems that bit of text is managed differently since SAK-33914.

Removing orphaned translation keys too

  1. … 1 more file in changeset.
SAK-43205 Assignments : missing key on preview page (#7880)

Also removing translation keys orphaned since SAK-42354

SAK-43205 Assignments : missing key on preview page (#7880)

Also removing translation keys orphaned since SAK-42354

(cherry picked from commit d80c055dde5d78f992f0db3e163bee815af0539d)

SAK-42912: Assignment - 'Archive is empty' text appears when sending an assignment with an encrypted zip (#7750)

SAK-42912: Assignment - 'Archive is empty' text appears when sending an assignment with an encrypted zip (#7750)

(cherry picked from commit cb2829eabcf77e49f16271fbaca323224350f5c4)

SAK-42912: Assignment - 'Archive is empty' text appears when sending an assignment with an encrypted zip (#7750)

(cherry picked from commit cb2829eabcf77e49f16271fbaca323224350f5c4)

SAK-42083 Consistency in the recover assignments and assessments options. (#7714)

  1. … 2 more files in changeset.
SAK-42083 Consistency in the recover assignments and assessments options. (#7714)

(cherry picked from commit 5cf68565fc4e58264df1e777b93c14cd2aeabed5)

  1. … 2 more files in changeset.
SAK-42083 Consistency in the recover assignments and assessments options. (#7714)

(cherry picked from commit 5cf68565fc4e58264df1e777b93c14cd2aeabed5)

  1. … 2 more files in changeset.
SAK-42803. Catalan bundles update for Sakai current master branch (#7569)

(cherry picked from commit 4c6364405dac692ea25451ab764d17f33f5de02d)

    • -4
    • +19
    ./assignment-noti-prefs_ca.properties
  1. … 78 more files in changeset.
SAK-42803. Catalan bundles update for Sakai current master branch (#7569)

    • -4
    • +19
    ./assignment-noti-prefs_ca.properties
  1. … 78 more files in changeset.
SAK-42474 Sakai grader (#7459)

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

Adds an alternative way of grading assignment submissions, hopefully

making the process more fluid.

  1. … 30 more files in changeset.
SAK-42354: Improve the Assignments Add/Edit page by grouping Access and Grading options (#7248)

* SAK-42354: Improve the Assignments Add/Edit page by grouping Access and Grading options

* SAK-42354: resolve merge conflicts

  1. … 13 more files in changeset.
SAK-42575 Turkish files updated 100%. (#7394)

  1. … 94 more files in changeset.
SAK-42466 send the Assignment reminder email with user's time zone included (#7351)

* SAK-42466 send the Assignment reminder email with user's time zone included.

Adds a new method to UserTimeService to fetch a preferred timezone for userId.

Also generally improve the email and debug logging.

* tabs

* missing implmentation on test class

(cherry picked from commit 01ae8ff29510ee95eacdf9b7b6734b1492d3517b)

  1. … 9 more files in changeset.
SAK-42466 send the Assignment reminder email with user's time zone included (#7351)

* SAK-42466 send the Assignment reminder email with user's time zone included.

Adds a new method to UserTimeService to fetch a preferred timezone for userId.

Also generally improve the email and debug logging.

* tabs

* missing implmentation on test class

  1. … 9 more files in changeset.
SAK-40753: i18n reminder email (#7240)

* SAK-40753: i18n reminder email

* date format should be same as before

  1. … 1 more file in changeset.
SAK-40753: i18n reminder email (#7240)

* SAK-40753: i18n reminder email

* date format should be same as before

(cherry picked from commit ec2b5ac4f7c09a922194c2a76d406180539a2968)

  1. … 1 more file in changeset.
SAK-42112 - indicate to students if their submission will be indexed to be compared against by other submissions (#7104)

* SAK-42112 - indicate to students if their submission will be indexed to be compared against by other submissions

* Removing the archaic word 'electronically'

* SAK-42112 - replaced equals to equalsIgnoreCase when comparing store_inst_index value

  1. … 1 more file in changeset.
SAK-42119 - Make Content Review results both mobile friendly and accessible (#7160)

  1. … 9 more files in changeset.
SAK-42130 Removed the period from the Assignments setting for 24-hour reminder (#7110)

SAK-42130 Removed the period from the Assignments setting for 24-hour reminder (#7110)

(cherry picked from commit bd16b7a1dc147a489b9a1a919416bdfca258a5ff)

Conflicts:

assignment/bundles/resources/assignment_es.properties

assignment/bundles/resources/assignment_tr_TR.properties

SAK-41883 - Internationalize error messages in the content review services that are now visible via SAK-41791 wherever possible (#7031)

  1. … 25 more files in changeset.
SAK-41883 - Internationalize error messages in the content review services that are now visible via SAK-41791 wherever possible (#7031)

(cherry picked from commit afd6ce5884f5f7e55a5b2b4c09f5284f7ff06e17)

  1. … 25 more files in changeset.
SAK-41973 Assignments confirmation page: rewording and no item case (#7036)

  1. … 1 more file in changeset.