Sakai.Git

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-33385 GBNG include selected group filter in export file name (#5587)

* SAK-33385 GBNG include selected group filter in export file name

* SAK-33385 introduce Validator.cleanFilename to replace all whitespace and invalid characters; use this when generating a GBNG export filename

* SAK-33385 remedy codacy issues

SAK-40279 - SiteManage: Fix prodcuer typos in requestContext.xml (#5765)

SAK-40283 On signup, Calendar event create has hardcoded language strings (#5767)

SAK-40283 On signup, Calendar event create has hardcoded language strings (#5767)

(cherry picked from commit f646d5377c48b3357b5d6b808421e349548a053c)

SAK-40294 Library: removed magic number from calculation

SAK-40272 - Grades multiplied by 100 in grades file (#5761)

SAK-40272 - Grades multiplied by 100 in grades file (#5761)

(cherry picked from commit b5bbfc20f31d6d806400de8e09b8e90823b3d070)

SAK-40287 Library: Made the footer positioning more efficient on every page load (#5773)

SAK-40291 - Update dependency-check-maven plugin to latest version 3.2.1 (#5776)

SAK-40290 - Upgrade Tika to 1.18 (#5777)

SAK-40290 - Upgrade Tika to 1.18 (#5777)

(cherry picked from commit 78f30c595db139767a6efe9b827ead9d40b9e9e3)

Conflicts:

master/pom.xml

SAK-40004 - Replace org.hibernate.dialect.function (#5770)

* Deleted deprecated Functions

* Requested Changes

SAK-40288 Rubrics Add/Renamed default permissions (#5774)

SAK-40289 Update database connection/pool drivers (#5775)

SAK-40241 GradebookNG incorrect columns in custom export (#5740)

* SAK-40241 GradebookNG incorrect columns in custom export

Also addressed issue with CandidateDetailProvider - Student Number not

appearing in export

* SAK-40241 Move to comparator to its own class

SAK-40241 GradebookNG incorrect columns in custom export (#5740)

* SAK-40241 GradebookNG incorrect columns in custom export

Also addressed issue with CandidateDetailProvider - Student Number not

appearing in export

* SAK-40241 Move to comparator to its own class

(cherry picked from commit 89347720509587bb6e77a23e352005f00f6c5756)

Conflicts:

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradingSchemaPanel.java

SAK-40280 Sakai 12.x spanish translation update for 12.3 release (#5766)

SAK-40004 - Lombok 1.18 (#5769)

* lombok updated to 1.18

* spaces

SAK-40212: web content > explain why pop-up behaviour changes for https vs http links (#5724)

(cherry picked from commit 9082b071b21bef9042cb839a0410f23a5449b4d3)

    • -0
    • +1
    /web/web-portlet/src/bundle/iframe.properties
    • -4
    • +3
    /web/web-portlet/src/bundle/vm/edit.vm
SAK-40212: web content > explain why pop-up behaviour changes for https vs http links (#5724)

    • -0
    • +1
    /web/web-portlet/src/bundle/iframe.properties
    • -4
    • +3
    /web/web-portlet/src/bundle/vm/edit.vm
SAK-40085 - Loss of information when a student add content in student page (#5763)

SAK-40085 - Loss of information when a student add content in student page (#5763)

(cherry picked from commit 139c73c159095bcfa165d6e87957a30aba7ad5b7)

SAK-40278 - Something with number of retakes causes ClassCastException (#5764)

(cherry picked from commit 31d82cde36b7d3a6aae255ad6b43f7997eb9f50b)

SAK-40278 - Something with number of retakes causes ClassCastException (#5764)

SAK-40264 - Cannot delete item in lessons (#5762)

SAK-40270 - Turn the setting defaullt for (#5759)

poh.resources.content.sync.visibility to true

SAK-40127: Instructor is not able to remove reviews in a peer assesment (#5695)

SAK-40127: Instructor is not able to remove reviews in a peer assesment (#5695)

(cherry picked from commit a43392986bf934d6ed4d11977e0425983dcb0204)

SAK-40011 - Grades in download Excel File are wrong in Assignment "Group (#5676)

* SAK-40011 - Grades in download Excel File are wrong in Assignment "Group

Submission - One submission per group"

* SAK-40011 - Grades in download Excel File are wrong in Assignment "Group

Submission - One submission per group"

Resolve conflicts after merge and rearrange logic a little.

SAK-40011 - Grades in download Excel File are wrong in Assignment "Group (#5676)

* SAK-40011 - Grades in download Excel File are wrong in Assignment "Group

Submission - One submission per group"

* SAK-40011 - Grades in download Excel File are wrong in Assignment "Group

Submission - One submission per group"

Resolve conflicts after merge and rearrange logic a little.

(cherry picked from commit 97ed98ac7a49397cb5506b39a3c775cdd477075e)