Sakai.Git

Clone Tools

Stats

Commits this week: 34
Total Committers: 367
Last Commit:
Commits this week: 34

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 08 Sep 2020
8:43 am

FerAlvarez95 <fernando_ayr@hotmail.com>

SAK-44242: SAMIGO - Duplicated headscripts.js (#8532)

Co-authored-by: Fernando Alvarez <fernando.alvarez1@um.es>

(cherry picked from commit b971b15b3f95acc9e6d2ea4621b1204ffdd04ac4)

Options
    • -1
    • +0
    /samigo/samigo-app/src/webapp/include/header.inc
8:41 am

Earle Nietzel <earle@longsight.com>

SAK-44220 ELFinder RTE produces an HTTP 500 (#8529)

Options
    • -4
    • +1
    /textarea/elfinder-sakai/src/webapp/WEB-INF/elfinder-servlet.xml
8:41 am

Earle Nietzel <earle@longsight.com>

SAK-44220 ELFinder RTE produces an HTTP 500 (#8529)

(cherry picked from commit 627c83bf99464ac862992c2b595f01a8da32b941)

Options
    • -4
    • +1
    /textarea/elfinder-sakai/src/webapp/WEB-INF/elfinder-servlet.xml
Monday 07 Sep 2020
12:09 am

Earle Nietzel <earle@longsight.com>

Move version to 22-SNAPSHOT

Options
    • -1
    • +1
    /access/access-impl/impl/pom.xml
    • -1
    • +1
    /access/access-tool/tool/pom.xml
    • -1
    • +1
    /access/pom.xml
    • -1
    • +1
    /access/web-tool/pom.xml
    • -1
    • +1
    /admin-su/pom.xml
    • -1
    • +1
    /admin-tools/pom.xml
    • -1
    • +1
    /announcement/announcement-api/api/pom.xml
    • -1
    • +1
    /announcement/announcement-impl/impl/pom.xml
    • -1
    • +1
    /announcement/announcement-tool/tool/pom.xml
    • -1
    • +1
    /announcement/pom.xml
    • -1
    • +1
    /archive/import-handlers/announcement-handlers/pom.xml
    • -1
    • +1
    /archive/pom.xml
    • -1
    • +1
    /assignment/api/pom.xml
    • -1
    • +1
    /assignment/impl/pom.xml
    • -1
    • +1
    /assignment/pom.xml
  16. … 442 more files in changeset.
Friday 04 Sep 2020
2:32 pm

Michael Greene <profmikegreene@gmail.com>

SAK-42331 WIP move local styles from delegatedaccess to library (#8238)

* SAK-42510 swap asmselect for bootstrap-multiselect

* SAK-42510 working and ready for cleanup

* SAK-42510 ready for PR

* SAK-42510 fix accessibility and table based layout

* SAK-42510 codacy fix via comment

Co-authored-by: Earle Nietzel <earle@longsight.com>

Options
    • -2
    • +0
    /delegatedaccess/tool/src/java/org/sakaiproject/delegatedaccess/tool/pages/BasePage.java
    • -194
    • +101
    /delegatedaccess/tool/src/java/org/sakaiproject/delegatedaccess/tool/pages/ShoppingEditBulkPage.html
    • -0
    • +2
    /delegatedaccess/tool/src/webapp/bundle/Messages.properties
    • -0
    • +2
    /delegatedaccess/tool/src/webapp/bundle/Messages_en.properties
    • -0
    • +2
    /delegatedaccess/tool/src/webapp/bundle/Messages_en_US.properties
    • -63
    • +0
    /delegatedaccess/tool/src/webapp/css/jquery.asmselect.css
    • -0
    • +142
    /delegatedaccess/tool/src/webapp/javascript/ShoppingEditBulkPage.js
    • -407
    • +0
    /delegatedaccess/tool/src/webapp/javascript/jquery.asmselect.js
    • -0
    • +38
    /library/src/morpheus-master/sass/modules/multiselect/_base.scss
    • -0
    • +16
    /library/src/morpheus-master/sass/modules/tool/delegatedaccess/_delegatedaccess.scss
    • -0
    • +2
    /library/src/morpheus-master/sass/tool.scss
1:27 pm

Sam Ottenhoff

SAK-44217 fix issue where Samigo GB item was being re-created every time assessment re-saved (#8528)

* SAK-44217 fix issue where Samigo GB item was being re-created every time the assessment was re-saved

* simpler return

(cherry picked from commit c8921493d661136627441c8ea8cea0e06be8b46e)

Options
    • -2
    • +5
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java
1:27 pm

Sam Ottenhoff

SAK-44217 fix issue where Samigo GB item was being re-created every time assessment re-saved (#8528)

* SAK-44217 fix issue where Samigo GB item was being re-created every time the assessment was re-saved

* simpler return

Options
    • -2
    • +5
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java
1:19 pm

Kyle Braden <brickatyourfeet@gmail.com>

SAK-43000 Give assessment settings expand/collapse all functions consistent icons and highlighting (#7764)

Options
    • -1
    • +20
    /samigo/samigo-app/src/webapp/js/authoring.js
    • -15
    • +0
    /samigo/samigo-app/src/webapp/jsf/author/authorSettings.jsp
    • -13
    • +0
    /samigo/samigo-app/src/webapp/jsf/author/publishedSettings.jsp
1:19 pm

Kyle Braden <brickatyourfeet@gmail.com>

SAK-43000 Give assessment settings expand/collapse all functions consistent icons and highlighting (#7764)

(cherry picked from commit 9708e85f2a6ef64a66f06264cec14c7b32bb096a)

Options
    • -1
    • +20
    /samigo/samigo-app/src/webapp/js/authoring.js
    • -15
    • +0
    /samigo/samigo-app/src/webapp/jsf/author/authorSettings.jsp
    • -13
    • +0
    /samigo/samigo-app/src/webapp/jsf/author/publishedSettings.jsp
1:12 pm

Juan <juantg1994@hotmail.es>

SAK-42911 Change part titles by default when one is created (#7702)

Options
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/AuthorPartListener.java
1:08 pm

bgarciaentornos <bgarcia@entornosdeformacion.com>

SAK-42874 T&Qs remove 'copy from pool' option inside pool menu (#7663)

Previously this was suposed to be managed by two different selectOneMenu

within the ItemHeadings file, but their selectItems are equal. I also

believe the rendered options were a bit strange, I'd say the only

important check for this is itemauthor.target == 'questionpool' but I'd

like someone else to confirm that, if possible.

(cherry picked from commit 4d3039c8dda4ed448dad81c7906c34fc88d1e7a3)

Conflicts:

samigo/samigo-app/src/webapp/jsf/author/item/itemHeadings.jsp

Options
    • -20
    • +7
    /samigo/samigo-app/src/webapp/jsf/author/item/itemHeadings.jsp
    • -3
    • +8
    /samigo/samigo-app/src/webapp/jsf/questionpool/selectQuestionType.jsp
1:08 pm

bgarciaentornos <bgarcia@entornosdeformacion.com>

SAK-42874 T&Qs remove 'copy from pool' option inside pool menu (#7663)

Previously this was suposed to be managed by two different selectOneMenu

within the ItemHeadings file, but their selectItems are equal. I also

believe the rendered options were a bit strange, I'd say the only

important check for this is itemauthor.target == 'questionpool' but I'd

like someone else to confirm that, if possible.

Options
    • -20
    • +7
    /samigo/samigo-app/src/webapp/jsf/author/item/itemHeadings.jsp
    • -3
    • +8
    /samigo/samigo-app/src/webapp/jsf/questionpool/selectQuestionType.jsp
1:08 pm

bgarciaentornos <bgarcia@entornosdeformacion.com>

SAK-42874 T&Qs remove 'copy from pool' option inside pool menu (#7663)

Previously this was suposed to be managed by two different selectOneMenu

within the ItemHeadings file, but their selectItems are equal. I also

believe the rendered options were a bit strange, I'd say the only

important check for this is itemauthor.target == 'questionpool' but I'd

like someone else to confirm that, if possible.

(cherry picked from commit 4d3039c8dda4ed448dad81c7906c34fc88d1e7a3)

Options
    • -20
    • +7
    /samigo/samigo-app/src/webapp/jsf/author/item/itemHeadings.jsp
    • -3
    • +8
    /samigo/samigo-app/src/webapp/jsf/questionpool/selectQuestionType.jsp
12:53 pm

FerAlvarez95 <fernando_ayr@hotmail.com>

SAK-43033: Bullhorns: Group assignments displaying twice (#8131)

Co-authored-by: Fernando Alvarez <fernando.alvarez1@um.es>

Options
    • -1
    • +17
    /portal/portal-api/api/src/java/org/sakaiproject/portal/beans/bullhornhandlers/AddAssignmentBullhornHandler.java
    • -2
    • +1
    /portal/portal-service-impl/impl/src/java/org/sakaiproject/portal/service/BullhornServiceImpl.java
12:53 pm

FerAlvarez95 <fernando_ayr@hotmail.com>

SAK-43033: Bullhorns: Group assignments displaying twice (#8131)

Co-authored-by: Fernando Alvarez <fernando.alvarez1@um.es>

(cherry picked from commit 9d79a45137fa91e57ab37cbbc95a0c91540f9d31)

Options
    • -1
    • +17
    /portal/portal-api/api/src/java/org/sakaiproject/portal/beans/bullhornhandlers/AddAssignmentBullhornHandler.java
    • -2
    • +1
    /portal/portal-service-impl/impl/src/java/org/sakaiproject/portal/service/BullhornServiceImpl.java
12:26 pm

FerAlvarez95 <fernando_ayr@hotmail.com>

SAK-43266: Correct capitalize 'Enter access View' (#8329)

Co-authored-by: Fernando Alvarez <fernando.alvarez1@um.es>

Options
    • -1
    • +0
    /library/src/morpheus-master/sass/modules/navigation/_base.scss
11:57 am

Adrian Fish

SAK-43853 Ensure resubmit date is valid in grader (#8527)

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

Options
    • -6
    • +7
    /assignment/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java
    • -18
    • +11
    /webcomponents/tool/src/main/frontend/js/grader/sakai-grader.js
    • -3
    • +20
    /webcomponents/tool/src/main/frontend/js/grader/submission.js
11:57 am

Adrian Fish

SAK-43853 Ensure resubmit date is valid in grader (#8527)

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

(cherry picked from commit b0c040213cf16bd2b5e7139e6f4a7057540bde90)

Options
    • -6
    • +7
    /assignment/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java
    • -18
    • +11
    /webcomponents/tool/src/main/frontend/js/grader/sakai-grader.js
    • -3
    • +20
    /webcomponents/tool/src/main/frontend/js/grader/submission.js
11:55 am

Sam Ottenhoff

SAK-43104 Samigo allow user with permission assesment.grade.any to grade (#8492)

* SAK-43104 make use of the assesment.grade.any permission to allow TA to grade

* SAK-43104 use the constants

(cherry picked from commit 247bcfc4e9c34cbb4c7555f14c6f95c53337feec)

Options
    • -3
    • +8
    /samigo/samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/integrated/SectionAwareServiceHelperImpl.java
11:55 am

Sam Ottenhoff

SAK-43104 Samigo allow user with permission assesment.grade.any to grade (#8492)

* SAK-43104 make use of the assesment.grade.any permission to allow TA to grade

* SAK-43104 use the constants

(cherry picked from commit 247bcfc4e9c34cbb4c7555f14c6f95c53337feec)

(cherry picked from commit a572f5c858d4b01c625aad8f2e3eec28fab38b35)

Options
    • -3
    • +8
    /samigo/samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/integrated/SectionAwareServiceHelperImpl.java
11:55 am

Sam Ottenhoff

SAK-43104 Samigo allow user with permission assesment.grade.any to grade (#8492)

* SAK-43104 make use of the assesment.grade.any permission to allow TA to grade

* SAK-43104 use the constants

Options
    • -3
    • +8
    /samigo/samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/integrated/SectionAwareServiceHelperImpl.java
11:33 am

Brian Jones

SAK-44150: samigo > add button to copy published assessment url to clipboard (a11y) (#8503)

Options
    • -0
    • +2
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages.properties
    • -0
    • +9
    /samigo/samigo-app/src/webapp/jsf/author/publishedSettings.jsp
11:33 am

Brian Jones

SAK-44150: samigo > add button to copy published assessment url to clipboard (a11y) (#8503)

(cherry picked from commit 6669441f03462068bff633c53f9f814546d52f80)

Options
    • -0
    • +2
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages.properties
    • -0
    • +9
    /samigo/samigo-app/src/webapp/jsf/author/publishedSettings.jsp
10:48 am

Austin

SAK-44171 Lessons tool does not display Resource folder displayname (#8486)

* SAK-44171 Lessons tool does not display Resource folder displayname

* SAK-44171 Lessons tool does not display Resource folder displayname

add improvements suggested in github comments

* SAK-44171 Lessons tool does not display Resource folder displayname

exception displays the collection id so we don't need to include it.

* Refactor of original PR

Co-authored-by: Earle Nietzel <earle@longsight.com>

Options
    • -15
    • +17
    /lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java
    • -5
    • +2
    /lessonbuilder/tool/src/webapp/WEB-INF/requestContext.xml
10:48 am

Austin

SAK-44171 Lessons tool does not display Resource folder displayname (#8486)

* SAK-44171 Lessons tool does not display Resource folder displayname

* SAK-44171 Lessons tool does not display Resource folder displayname

add improvements suggested in github comments

* SAK-44171 Lessons tool does not display Resource folder displayname

exception displays the collection id so we don't need to include it.

* Refactor of original PR

Co-authored-by: Earle Nietzel <earle@longsight.com>

(cherry picked from commit ca7625fb2305604427105886b45aff0c80bf67e5)

Conflicts:

lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java

lessonbuilder/tool/src/webapp/WEB-INF/requestContext.xml

Options
    • -13
    • +17
    /lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java
    • -5
    • +2
    /lessonbuilder/tool/src/webapp/WEB-INF/requestContext.xml
10:06 am

dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump xercesImpl in /announcement/announcement-impl/impl (#8426)

Bumps xercesImpl from 2.6.2 to 2.12.0.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Options
    • -1
    • +1
    /announcement/announcement-impl/impl/pom.xml
9:47 am

Brian Jones

SAK-43810: jsf > add tabindex=0 to colour picker icons (#8518)

Options
    • -0
    • +1
    /jsf/jsf-widgets/src/java/org/sakaiproject/jsf/renderer/InputColorRenderer.java
9:42 am

Adrian Fish

SAK-43782 Grader feedback comment updates correctly (#8526)

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

Options
    • -4
    • +4
    /webcomponents/tool/src/main/frontend/js/grader/sakai-grader.js
9:42 am

Adrian Fish

SAK-43782 Grader feedback comment updates correctly (#8526)

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

(cherry picked from commit b02919aff6ded0c637ba3084c23a596c9ab19473)

Options
    • -4
    • +4
    /webcomponents/tool/src/main/frontend/js/grader/sakai-grader.js
9:28 am

Sam Ottenhoff

SAK-44196 fix ArrayIndexOutOfBoundsException when missing a resource key (#8519)

(cherry picked from commit 67d940714e8231cbb5a0e06e6249d16d68659f0a)

Options
    • -12
    • +3
    /kernel/kernel-util/src/main/java/org/sakaiproject/util/ResourceLoader.java