John Ansorge

SAK-44132 Add Sakai property to disable group permission locking in Forums (#8470)

SAK-44132 Add Sakai property to disable group permission locking in Forums (#8470)

(cherry picked from commit efc5f79a94592baefb5f8f4977e1cf7dcfbe74b2)

SAK-44132 Add Sakai property to disable group permission locking in Forums (#8470)

(cherry picked from commit efc5f79a94592baefb5f8f4977e1cf7dcfbe74b2)

Prevent 'restricted roles' from being removed in Site Info https://jira.sakaiproject.org/browse/SAK-43056 (#7799)

(cherry picked from commit 32b9f73ddb9f6bde0f7288c0ad78880f8a2e9921)

Prevent 'restricted roles' from being removed in Site Info https://jira.sakaiproject.org/browse/SAK-43056 (#7799)

SAK-42418 Give sitestats /direct/runreport a siteID for system-wide reports (#7305)

(cherry picked from commit 6e18eda306d74f813bde0cb20e3b5fcba61c67e8)

Conflicts:

sitestats/sitestats-tool/src/java/org/sakaiproject/sitestats/tool/entityproviders/SiteStatsEntityProvider.java

SAK-42418 Give sitestats /direct/runreport a siteID for system-wide reports (#7305)

SAK-42343 Fix previous instructor comments not displaying (#7256)

(cherry picked from commit 3d9ead691d0b96949e1da2a5c83bc4f4254e48e0)

SAK-42343 Fix previous instructor comments not displaying (#7256)

SAK-42341 Add additional data to sitestats runreport output (#7236)

(cherry picked from commit 9079ffecd2002c449e735f6b652f0ae833a19434)

SAK-42341 Add additional data to sitestats runreport output (#7236)

SAK-40998 Hide forums/topics student has no permissions in (#6313)

* SAK-40998 Hide forums/topics student has no permissions in

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

Fix issue that was letting students see forums and topics they shouldn't see on the Forums view.

* Fix remaining instances of conditional columns in Forums

Other than dfForumDetail, I don't actually believe any of these condition statments actually do anything. Some relate to deleted messages in Statistics, but the back end already seems to be removing those from the lists used by the datables. The other instance is in the Organize page, but since only Instructors see it, I don't think there's a scenario where they wouldn't have permissions for a forum/topic.

That all being said, it seems better to be safe than sorry and wrap everything in a conditional panelGroup, so that's what I did.

SAK-40998 Hide forums/topics student has no permissions in (#6313)

* SAK-40998 Hide forums/topics student has no permissions in

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

Fix issue that was letting students see forums and topics they shouldn't see on the Forums view.

* Fix remaining instances of conditional columns in Forums

Other than dfForumDetail, I don't actually believe any of these condition statments actually do anything. Some relate to deleted messages in Statistics, but the back end already seems to be removing those from the lists used by the datables. The other instance is in the Organize page, but since only Instructors see it, I don't think there's a scenario where they wouldn't have permissions for a forum/topic.

That all being said, it seems better to be safe than sorry and wrap everything in a conditional panelGroup, so that's what I did.

(cherry picked from commit df062e251ccd630fd0dc4872d9ea5e480cd7b5c4)

Don't show warning if this is the first attempt

SAK-34145 Don't show warning if this is the first attempt

(cherry picked from commit cf75b7f4d9183ffe1c4deeb171e6bdb07fa3c146)

SAK-34145

Updating messages to be i18n friendly

(cherry picked from commit 3e00d0cfec8c912f29130fb1810d720bd637cc52)

SAK-34145

Updating messages to be i18n friendly

SAK-34145 Clarify autosubmit implications for student

Add pop-up warning for assessement takers that starting a new attempt could impact their grade. Pop-up only appears if autosubmit is on, and grading is set to "last score" or "average score". Warning doesn't apply if autosubmit is off, or if "highest score" is in effect.

https://jira.sakaiproject.org/browse/SAK-34145#

SAK-34145 Clarify autosubmit implications for student

Add pop-up warning for assessement takers that starting a new attempt could impact their grade. Pop-up only appears if autosubmit is on, and grading is set to "last score" or "average score". Warning doesn't apply if autosubmit is off, or if "highest score" is in effect.

https://jira.sakaiproject.org/browse/SAK-34145#

(cherry picked from commit 1e794ab3108c8d97533ed6fc875ffb63abe0ba58)

SAK-40764 (#6138)

Check that radioUnlimitedAttendee element exists before getting its property.

SAK-38441 Fix multiple event spreadsheet export (#6125)

https://jira.sakaiproject.org/browse/SAK-38441?attachmentOrder=desc

(cherry picked from commit 5adfe8108b48c05c3fe227f14dc97b36c704aba9)

SAK-32565 Fix for Sakai 11.x (#4453)

This PR is for Sakai 11.x. Not Trunk! (I hope I do this right.)

SAK-32565 Fix Peer Assessment issues from SAK-32064 (#4448)

Refines the techniques for disabling the controls after the assignment

is posted.

SAK-32529 - Add web service to increment all dates for assignment (#4413)

* SAK-32529 - Add web service to shift all dates for assignment

A new web service to increment all dates for an assignment by the same

amount of days and hours.

* tabs/spaces

* Fixing indentation

SAK-32064 Prevent assignments from being switched from individual to group assignments (#4381)

* SAK-32064

Prevent changing from Individual to Group assignment after it is posted

to students

* SAK-32064

Additional clarification for locked contingent settings.

* Fixing indents

* Fixing indent

SAM-3191 Fix scoring of all-or-nothing mult choice mult correct (#4360)

Fix precision issue when scoring multiple-choice multiple-correct

questions when the all-or-nothing option is on.

SAM-3191 Fix scoring of all-or-nothing mult choice mult correct (#4360)

Fix precision issue when scoring multiple-choice multiple-correct

questions when the all-or-nothing option is on.

SAM-3084 Fix feedback logic for MC-MC (#3650)

* SAM-3084 Fix feedback logic for MC-MC

DeliveryActionListener.java was forgetting if students selected a wrong

answer when it checked to see if they got the right number of correct

answers.

* Fixing clumsy coding

Also simplifying logic. It makes no sense to set haswronganswer back

to false under any circumstance if it had been set to true.

* Fix indenting to match weird space/tabs pattern in original

SAM-3084 Fix feedback logic for MC-MC (#3650)

* SAM-3084 Fix feedback logic for MC-MC

DeliveryActionListener.java was forgetting if students selected a wrong

answer when it checked to see if they got the right number of correct

answers.

* Fixing clumsy coding

Also simplifying logic. It makes no sense to set haswronganswer back

to false under any circumstance if it had been set to true.

* Fix indenting to match weird space/tabs pattern in original