Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Revert "SAK-45421 Make rubrics work with csv gb item import (#9214)"

This reverts commit 9a49e561d511806692494f27f8ce08e938e67074.

  1. … 7 more files in changeset.
Revert "SAK-45421 Hateoas prior to spring 5 upgrade"

This reverts commit 9907eb67233eeba927514c836d0d394d2a797a49.

SAK-45421 Hateoas prior to spring 5 upgrade

SAK-41604 Add group support to rubrics (#8846)

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

  1. … 15 more files in changeset.
SAK-45421 Make rubrics work with csv gb item import (#9214)

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

(cherry picked from commit a360bb67408c22cd726b7ccfc6b3fab6bcd20533)

  1. … 7 more files in changeset.
SAK-45421 Make rubrics work with csv gb item import (#9214)

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

  1. … 7 more files in changeset.
SAK-45421 Make rubrics work with csv gb item import (#9214)

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

(cherry picked from commit a360bb67408c22cd726b7ccfc6b3fab6bcd20533)

  1. … 7 more files in changeset.
SAK-45364 rubrics: Update Joda-time => java.time (#9183)

  1. … 1 more file in changeset.
SAK-44879 Allow marking rubric associations active (#8952)

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

(cherry picked from commit 17f4990e604e00b77b15cff76ee21a0774a903a5)

  1. … 19 more files in changeset.
SAK-44879 Allow marking rubric associations active (#8952)

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

  1. … 19 more files in changeset.
SAK-44726 Clean up rubrics missing method (#8857)

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

... and improve some of the rest endpoint names

  1. … 10 more files in changeset.
SAK-44726 Clean up rubrics missing method (#8857)

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

... and improve some of the rest endpoint names

(cherry picked from commit b2ef0704e832ccbdabb25da56c421a3ca98e1272)

  1. … 10 more files in changeset.
SAK-43968 Spring 5.2.8 / Hibernate 5.3.18 (#8459)

  1. … 178 more files in changeset.
SAK-34190 allow deleting a published assessment with submissions (#8200)

* SAK-34190 allow deleting a published assessment with submissions as we now have restoration capabilities

* Removed hard deletion of rubric evaluations when soft deleting associations

Co-authored-by: Adrian Fish <adrian.r.fish@gmail.com>

  1. … 2 more files in changeset.
SAK-34190 allow deleting a published assessment with submissions (#8200)

* SAK-34190 allow deleting a published assessment with submissions as we now have restoration capabilities

* Removed hard deletion of rubric evaluations when soft deleting associations

Co-authored-by: Adrian Fish <adrian.r.fish@gmail.com>

(cherry picked from commit fc87db778d2a79893b55be4e78370430f68a519f)

  1. … 2 more files in changeset.
SAK-42461 - Rubrics: Impossible to delete a rubric after deleting site. (#8152)

(cherry picked from commit 0e70675f401e0bc76273e4a69a4a078d8a69fc1e)

  1. … 3 more files in changeset.
SAK-42461 - Rubrics: Impossible to delete a rubric after deleting site. (#8152)

  1. … 3 more files in changeset.
SAK-43357 allow rubrics component to save evaluations (19.x) (#8096)

  1. … 16 more files in changeset.
SAK-43110 show rubric button when in lessons -> samigo (#8054)

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

(cherry picked from commit 5e90370fda8976e8b3bb440f721ce0e43cc124c3)

  1. … 5 more files in changeset.
SAK-43110 show rubric button when in lessons -> samigo (#8054)

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

(cherry picked from commit 5e90370fda8976e8b3bb440f721ce0e43cc124c3)

Conflicts:

rubrics/impl/src/main/java/org/sakaiproject/rubrics/logic/RubricsServiceImpl.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java

  1. … 5 more files in changeset.
SAK-43110 show rubric button when in lessons -> samigo (#8054)

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

  1. … 5 more files in changeset.
SAK-43357 allow rubrics component to save evaluations (#8066)

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

(cherry picked from commit 544e4c94193954132bf7d2036435c3d8d6210462)

  1. … 18 more files in changeset.
SAK-43357 allow rubrics component to save evaluations (#8066)

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

  1. … 18 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

  1. … 74 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

  1. … 75 more files in changeset.
SAK-43112 Recover rubrics with softly deleted assignments (#7833)

NOTE: The order of the deleteRubricAssociationParameters method was

wrong in the service declaration.

  1. … 3 more files in changeset.
SAK-43112 Recover rubrics with softly deleted assignments (#7833)

NOTE: The order of the deleteRubricAssociationParameters method was

wrong in the service declaration.

(cherry picked from commit e19805e958c45643ca6c198c4e927cf3bebba5db)

  1. … 3 more files in changeset.
SAK-41175 Allow floating point numbers in rubrics points (#7853)

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

(cherry picked from commit 3218c840b73b0ae0308814c050c4b68034a3ea7a)

  1. … 6 more files in changeset.
SAK-41175 Allow floating point numbers in rubrics points (#7853)

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

  1. … 6 more files in changeset.
SAK-41175 Allow floating point numbers in rubrics points (#7853)

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

(cherry picked from commit 3218c840b73b0ae0308814c050c4b68034a3ea7a)

  1. … 6 more files in changeset.