Sakai.Git

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-31960 (#4899)

(cherry picked from commit b5a08ec428e77ecb8bff6dbd0bd23f4655688ede)

SAK-33486 (#4898)

SAK-33486 (#4898)

SAK-33486 (#4898)

Assignments student submission view missing assignment attachments part 2 (#4897)

(cherry picked from commit 7f6582042e8bb489d156f42748913c272ce88fb7)

Assignments student submission view missing assignment attachments part 2 (#4897)

SAK-33480 Assignments Student Submission Preview template (#4890)

(cherry picked from commit dc08095848f69a5a4e7f7d3da5bc51f85b51e770)

SAK-33480 Assignments Student Submission Preview template (#4890)

SAK-33479 Assignments student submission view missing assignment attachments (#4889)

SAK-33479 Assignments student submission view missing assignment attachments (#4889)

(cherry picked from commit a4a9fffb1337a3a0934ff00e4c6f040913095cb3)

SAK-32346 (2) (#4893)

SAK-32346 (2) (#4893)

SAK-32346 (2) (#4893)

SAK-32346 (#4891)

SAK-32346 (#4891)

SAK-32346 (#4891)

SAK-33476 Assignments Student View Grade template fixes (#4888)

SAK-33476 Assignments Student View Grade template fixes (#4888)

(cherry picked from commit d81820752719bb0b0dda732165b9b27ab1829e46)

KNL-1551 - Fix specific to 11.x, this location was changed by SAK-32184

Revert "KNL-1493 : SiteService.getUserSites should have way to pre-filter sites (Sites drawer slow with lots of sites) (#4781)"

This reverts commit 36ad76d3116d3bf21a274f9cc5e09d09a7130f64.

SAK-33448 ensure column filter dropdown menus are not repositioned on scroll (#4885)

SAK-33448 ensure column filter dropdown menus are not repositioned on scroll (#4885)

SAK-33385 add ability to filter custom export by section/group (#4883)

SAK-33385 add ability to filter custom export by section/group (#4883)

KNL-1541 - Missing fields initializer for change (#4886)

AssignmentService API raw type (#4872)

List, Collect raw type

public ..

Generate Element Comment

AssignmentService API raw type (#4872)

List, Collect raw type

public ..

Generate Element Comment

(cherry picked from commit f3dd4cdd0a540eb36880b48c8c690dae3c4facaa)

Merge branch 'master' of https://github.com/sakaiproject/sakai

* 'master' of https://github.com/sakaiproject/sakai: (343 commits)

SAK-33419 Don’t die when re-ordering announcements (#4860)

SAK-33363 - Re-enable autosave plugin (#4884)

SAM-3272 make the accordion session storage local to the assessmentId (#4874)

SAK-33438 - Upgrade to CKEditor 4.7 (#4881)

LSNBLDR-878 Fix lessons tool calendar colours. (#4866)

SAK-33408: Dropbox > Group/Section filter visibility is hard-coded to true; should be based on permissions (#4839)

SAK-33426 - Simplify language in toolorder (#4875)

SAK-33409 - Upgrade the CKEditor to the latest maintenance release (#4864)

SAK-33437 Sitestats treats event_id as Integer (#4873)

SAM-3271 send to all instructors if there are no group instructors (#4869)

SAK-26175 - Oncourse and kb.iu.edu mentioned in default language text (#4841)

SAK-33390 - International characters lost resizing (#4852)

SAK-33430 use a proper index on site_id because queries are against site_id (#4871)

SAK-33420 Assignment grade report: .xlsx (#4856)

SAK-33424 Assignments submission notifications (#4863)

KNL-1551-2 - Needs xml-apis included to startup (#4865)

LSNBLDR-877 use Hibernate and siteService to retrieve instead of bad custom SQL (#4858)

SAK-33426 - Fix up some issues with lti toolorder (#4862)

KNL-1551 - Update antisamy to latest version (1.5.7) (#4859)

SAK-32330 - Grouping of several Lesson tool instances in Site Info is gone (#4765)

...

SAK-33419 Simple fix for announcement reordering (#4861)

This just drops the generics from the comparator that fixes the issue where a classcast exception was thrown when re-ordering items.

SAK-33419 Don’t die when re-ordering announcements (#4860)

The issues is that although the session state always had AnnouncementWrappers in it and the comparator works fine on an AnnouncementWrapper when re-ordering the comparator is used on a plain AnnouncementMessage. This would cause a ClassCastException.

The problem with the original refactor was that although I applied generics to some of the code I didn’t go far enough which is why I missed the reordering case. A simple fix would be to just drop the generics which would fix the problem but I think in the long run we’re better to try to keep the generics as it makes the code more maintainable and easier to refactor later on.

This adds generics to all the uses of AnnouncementComparator so that we’re sure there aren’t any more cases of the comparator being used on the wrong type. We also rename the Comparator to make it clearer what it will sort.