Sakai.Git

Clone Tools

Stats

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

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 01 Dec 2020
2:51 am

FerAlvarez95 <fernando_ayr@hotmail.com>

SAK-43838: SAMIGO - Error when editing Matching questions (#8785)

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

(cherry picked from commit 2d3b8d6fc16ca19691daefd15ddc0b32eca44fd7)

Options
    • -20
    • +16
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ItemAddListener.java
2:51 am

FerAlvarez95 <fernando_ayr@hotmail.com>

SAK-43838: SAMIGO - Error when editing Matching questions (#8785)

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

(cherry picked from commit 2d3b8d6fc16ca19691daefd15ddc0b32eca44fd7)

Options
    • -20
    • +16
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ItemAddListener.java
2:51 am

FerAlvarez95 <fernando_ayr@hotmail.com>

SAK-43838: SAMIGO - Error when editing Matching questions (#8785)

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

Options
    • -20
    • +16
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ItemAddListener.java
2:51 am

FerAlvarez95 <fernando_ayr@hotmail.com>

SAK-43838: SAMIGO - Error when editing Matching questions (#8785)

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

(cherry picked from commit 2d3b8d6fc16ca19691daefd15ddc0b32eca44fd7)

Options
    • -20
    • +16
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ItemAddListener.java
Monday 30 Nov 2020
4:00 pm

Sam Ottenhoff

SAK-44736 update cql-java dependency (#8851)

Options
    • -2
    • +1
    /citations/citations-osid/web2bridge/pom.xml
    • -1
    • +1
    /citations/citations-tool/tool/pom.xml
    • -2
    • +1
    /citations/citations-util/util/pom.xml
    • -2
    • +2
    /master/pom.xml
3:51 pm

Jesús María Méndez Pérez <jesusmmp@gmail.com>

SAK-44722: SAMIGO - Uncategorized text is hardcoded (#8853)

Options
    • -0
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages.properties
    • -0
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages_es.properties
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java
3:51 pm

Jesús María Méndez Pérez <jesusmmp@gmail.com>

SAK-44722: SAMIGO - Uncategorized text is hardcoded (#8853)

(cherry picked from commit ca3ec833ab22306364a6a4ffe98be39ec5506b71)

Options
    • -0
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages.properties
    • -0
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages_es.properties
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/AssessmentSettingsBean.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/PublishedAssessmentSettingsBean.java
10:41 am

Adrian Fish

SAK-44727 Add test for this.evaluation being present (#8850)

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

(cherry picked from commit 5fb5b706dc19629b8aea146c292f809e2fff1985)

Options
    • -1
    • +1
    /webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-grading.js
10:41 am

Adrian Fish

SAK-44727 Add test for this.evaluation being present (#8850)

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

Options
    • -1
    • +1
    /webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-grading.js
10:41 am

Adrian Fish

SAK-44727 Add test for this.evaluation being present (#8850)

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

(cherry picked from commit 5fb5b706dc19629b8aea146c292f809e2fff1985)

Options
    • -1
    • +1
    /webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-grading.js
10:05 am

Code Hugger (Matthew Jones) <matthew.jones@learnxp.com>

SAK-44705 - Resources: Copy URL to Clipboard - Dead link (#8847)

Options
    • -1
    • +1
    /content/content-tool/tool/src/webapp/vm/resources/sakai_properties.vm
10:05 am

Code Hugger (Matthew Jones) <matthew.jones@learnxp.com>

SAK-44705 - Resources: Copy URL to Clipboard - Dead link (#8847)

(cherry picked from commit 4a6b193676ce24c9a2b0921205d2c01b530e2168)

Options
    • -1
    • +1
    /content/content-tool/tool/src/webapp/vm/resources/sakai_properties.vm
8:18 am

FerAlvarez95 <fernando_ayr@hotmail.com>

SAK-44734: Correct spanish translate on lessons at upload ZIP (#8849)

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

Options
    • -1
    • +1
    /lessonbuilder/tool/src/resources/messages_es.properties
Saturday 28 Nov 2020
1:41 pm

Code Hugger (Matthew Jones) <matthew.jones@learnxp.com>

SAK-43378 - Fix CSV reader so event end times are not included (#8794)

Options
    • -2
    • +4
    /calendar/calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/readers/CSVReader.java
Wednesday 25 Nov 2020
5:53 pm

Sam Ottenhoff

SAK-44696 add branches for builds (#8843)

Options
    • -2
    • +4
    /.github/workflows/maven.yml
11:00 am

Earle Nietzel <earle@longsight.com>

SAK-43805 Assignment add conversion i18n bundles (#8838)

(cherry picked from commit 4f74a530c5f5a480b3ac353a9e65aa498b8241f3)

Options
    • -0
    • +6
    /assignment/api/pom.xml
11:00 am

Earle Nietzel <earle@longsight.com>

SAK-43805 Assignment add conversion i18n bundles (#8838)

Options
    • -0
    • +6
    /assignment/api/pom.xml
10:11 am

Adrian Fish

SAK-44682 Re add storybook data, styles and i18n (#8821)

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

Options
    • -2
    • +5
    /library/src/morpheus-master/sass/themes/_light.scss
    • -0
    • +3
    /webcomponents/tool/src/main/frontend/.gitignore
    • -4
    • +4
    /webcomponents/tool/src/main/frontend/js/calendar/sakai-calendar-create-event.js
    • -7
    • +15
    /webcomponents/tool/src/main/frontend/js/calendar/sakai-calendar.js
    • -1
    • +1
    /webcomponents/tool/src/main/frontend/js/imageeditor/sakai-image-editor.js
    • -2
    • +2
    /webcomponents/tool/src/main/frontend/js/sakai-options-menu.js
    • -23
    • +21
    /webcomponents/tool/src/main/frontend/js/tasks/sakai-tasks-create-task.js
    • -5
    • +3
    /webcomponents/tool/src/main/frontend/js/tasks/sakai-tasks.js
    • -0
    • +70
    /webcomponents/tool/src/main/frontend/stories/data/calendar-data.js
    • -0
    • +28
    /webcomponents/tool/src/main/frontend/stories/data/course-announcements-data.js
    • -0
    • +31
    /webcomponents/tool/src/main/frontend/stories/data/course-dashboard-data.js
    • -0
    • +12
    /webcomponents/tool/src/main/frontend/stories/data/course-grades-data.js
    • -0
    • +11
    /webcomponents/tool/src/main/frontend/stories/data/forums-data.js
    • -0
    • +28
    /webcomponents/tool/src/main/frontend/stories/data/home-announcements-data.js
    • -0
    • +28
    /webcomponents/tool/src/main/frontend/stories/data/home-dashboard-data.js
  16. … 28 more files in changeset.
10:11 am

Adrian Fish

SAK-44682 Re add storybook data, styles and i18n (#8821)

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

(cherry picked from commit 298f9f10b38ad626ac6f7812b03130f481a84a35)

Options
    • -2
    • +5
    /library/src/morpheus-master/sass/themes/_light.scss
    • -0
    • +3
    /webcomponents/tool/src/main/frontend/.gitignore
    • -4
    • +4
    /webcomponents/tool/src/main/frontend/js/calendar/sakai-calendar-create-event.js
    • -7
    • +15
    /webcomponents/tool/src/main/frontend/js/calendar/sakai-calendar.js
    • -1
    • +1
    /webcomponents/tool/src/main/frontend/js/imageeditor/sakai-image-editor.js
    • -2
    • +2
    /webcomponents/tool/src/main/frontend/js/sakai-options-menu.js
    • -23
    • +21
    /webcomponents/tool/src/main/frontend/js/tasks/sakai-tasks-create-task.js
    • -5
    • +3
    /webcomponents/tool/src/main/frontend/js/tasks/sakai-tasks.js
    • -0
    • +70
    /webcomponents/tool/src/main/frontend/stories/data/calendar-data.js
    • -0
    • +28
    /webcomponents/tool/src/main/frontend/stories/data/course-announcements-data.js
    • -0
    • +31
    /webcomponents/tool/src/main/frontend/stories/data/course-dashboard-data.js
    • -0
    • +12
    /webcomponents/tool/src/main/frontend/stories/data/course-grades-data.js
    • -0
    • +11
    /webcomponents/tool/src/main/frontend/stories/data/forums-data.js
    • -0
    • +28
    /webcomponents/tool/src/main/frontend/stories/data/home-announcements-data.js
    • -0
    • +28
    /webcomponents/tool/src/main/frontend/stories/data/home-dashboard-data.js
  16. … 28 more files in changeset.
Tuesday 24 Nov 2020
2:57 pm

Adrian Fish

SAK-42371 Added DRAFT and RETURNED status to rubric evaluation (#8830)

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

Adding these stati means we can use the evaluation backend as the

cache for the evaluation as we switch between tools and their helpers.

(cherry picked from commit ee2f558f8ad9040bc496fa9a5b2b6e89da377c8d)

Options
    • -0
    • +1
    /rubrics/api/src/main/bundle/rubrics.properties
    • -0
    • +6
    /rubrics/api/src/main/java/org/sakaiproject/rubrics/logic/model/Evaluation.java
    • -0
    • +32
    /rubrics/api/src/main/java/org/sakaiproject/rubrics/logic/model/EvaluationStatus.java
    • -2
    • +2
    /rubrics/api/src/main/java/org/sakaiproject/rubrics/logic/repository/EvaluationRepository.java
    • -3
    • +2
    /webcomponents/tool/src/main/frontend/js/grader/sakai-grader.js
    • -3
    • +11
    /webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-grading.js
    • -1
    • +3
    /webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-student-comment.js
2:57 pm

Adrian Fish

SAK-42371 Added DRAFT and RETURNED status to rubric evaluation (#8830)

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

Adding these stati means we can use the evaluation backend as the

cache for the evaluation as we switch between tools and their helpers.

Options
    • -0
    • +1
    /rubrics/api/src/main/bundle/rubrics.properties
    • -0
    • +6
    /rubrics/api/src/main/java/org/sakaiproject/rubrics/logic/model/Evaluation.java
    • -0
    • +32
    /rubrics/api/src/main/java/org/sakaiproject/rubrics/logic/model/EvaluationStatus.java
    • -2
    • +2
    /rubrics/api/src/main/java/org/sakaiproject/rubrics/logic/repository/EvaluationRepository.java
    • -3
    • +2
    /webcomponents/tool/src/main/frontend/js/grader/sakai-grader.js
    • -3
    • +11
    /webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-grading.js
    • -1
    • +3
    /webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-student-comment.js
2:57 pm

Adrian Fish

SAK-42371 Added DRAFT and RETURNED status to rubric evaluation (#8830)

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

Adding these stati means we can use the evaluation backend as the

cache for the evaluation as we switch between tools and their helpers.

(cherry picked from commit ee2f558f8ad9040bc496fa9a5b2b6e89da377c8d)

Conflicts:

rubrics/api/src/main/bundle/rubrics.properties

Options
    • -0
    • +1
    /rubrics/api/src/main/bundle/rubrics.properties
    • -0
    • +6
    /rubrics/api/src/main/java/org/sakaiproject/rubrics/logic/model/Evaluation.java
    • -0
    • +32
    /rubrics/api/src/main/java/org/sakaiproject/rubrics/logic/model/EvaluationStatus.java
    • -2
    • +2
    /rubrics/api/src/main/java/org/sakaiproject/rubrics/logic/repository/EvaluationRepository.java
    • -3
    • +2
    /webcomponents/tool/src/main/frontend/js/grader/sakai-grader.js
    • -3
    • +11
    /webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-grading.js
    • -1
    • +3
    /webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-student-comment.js
1:14 pm

Sam Ottenhoff

SAK-44627 use timer to see if user has navigated to another assessment (#8788)

Options
    • -0
    • +2
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages.properties
    • -1
    • +1
    /samigo/samigo-app/src/webapp/js/saveForm.js
    • -0
    • +4
    /samigo/samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp
    • -1
    • +1
    /samigo/samigo-app/src/webapp/jsf/delivery/getTimerProgress.jsp
    • -1
    • +13
    /samigo/samigo-app/src/webapp/jsf/widget/timerBar/timerbar.js
1:14 pm

Sam Ottenhoff

SAK-44627 use timer to see if user has navigated to another assessment (#8788)

(cherry picked from commit b72bda665a1592c50dad092943d8bae05e9a5b9d)

Options
    • -0
    • +2
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages.properties
    • -1
    • +1
    /samigo/samigo-app/src/webapp/js/saveForm.js
    • -0
    • +4
    /samigo/samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp
    • -1
    • +1
    /samigo/samigo-app/src/webapp/jsf/delivery/getTimerProgress.jsp
    • -1
    • +13
    /samigo/samigo-app/src/webapp/jsf/widget/timerBar/timerbar.js
1:14 pm

Sam Ottenhoff

SAK-44627 use timer to see if user has navigated to another assessment (#8788)

(cherry picked from commit b72bda665a1592c50dad092943d8bae05e9a5b9d)

Options
    • -0
    • +2
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages.properties
    • -1
    • +1
    /samigo/samigo-app/src/webapp/js/saveForm.js
    • -0
    • +4
    /samigo/samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp
    • -1
    • +1
    /samigo/samigo-app/src/webapp/jsf/delivery/getTimerProgress.jsp
    • -1
    • +13
    /samigo/samigo-app/src/webapp/jsf/widget/timerBar/timerbar.js
12:11 pm

Adrian Fish

SAK-44710 Updated the dashboard's readme. (#8835)

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

Options
    • -4
    • +89
    /dashboard/README.md
12:09 pm

Sam Ottenhoff

SAK-44696 Github Actions use a different jUnit annotator (#8837)

* use a different test annotator

* test failure

* revert

Options
    • -4
    • +2
    /.github/workflows/maven.yml
10:35 am

Sam Ottenhoff

SAK-44696 setup Github Actions to replace Travis-CI (#8828)

Options
    • -0
    • +38
    /.github/workflows/maven.yml
    • -23
    • +0
    /.travis.yml
    • -14
    • +0
    /gradebookng/pom.xml
    • -5
    • +5
    /master/pom.xml
    • -1
    • +1
    /webservices/cxf/pom.xml
10:21 am

Paul Lukasewych

SAK-44305 Messages > Save Draft > Recipient not Saved (#8790)

Options
    • -0
    • +4
    /msgcntr/messageforums-api/pom.xml
    • -1
    • +2
    /msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties
    • -0
    • +95
    /msgcntr/messageforums-api/src/java/org/sakaiproject/api/app/messageforums/DraftRecipient.java
    • -0
    • +6
    /msgcntr/messageforums-api/src/java/org/sakaiproject/api/app/messageforums/MessageForumsMessageManager.java
    • -0
    • +3
    /msgcntr/messageforums-api/src/java/org/sakaiproject/api/app/messageforums/ui/PrivateMessageManager.java
    • -0
    • +121
    /msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/DraftRecipientsDelegate.java
    • -2
    • +22
    /msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
    • -0
    • +1
    /msgcntr/messageforums-app/src/webapp/jsp/compose.jsp
    • -0
    • +20
    /msgcntr/messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/MessageForumsMessageManagerImpl.java
    • -14
    • +26
    /msgcntr/messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/ui/PrivateMessageManagerImpl.java
    • -0
    • +5
    /msgcntr/messageforums-component-impl/src/webapp/WEB-INF/components.xml
10:21 am

Paul Lukasewych

SAK-44305 Messages > Save Draft > Recipient not Saved (#8790)

(cherry picked from commit d297d8928b445ff99ec1a2b6b5a0134356c9d28f)

Options
    • -0
    • +4
    /msgcntr/messageforums-api/pom.xml
    • -1
    • +2
    /msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties
    • -0
    • +95
    /msgcntr/messageforums-api/src/java/org/sakaiproject/api/app/messageforums/DraftRecipient.java
    • -0
    • +6
    /msgcntr/messageforums-api/src/java/org/sakaiproject/api/app/messageforums/MessageForumsMessageManager.java
    • -0
    • +3
    /msgcntr/messageforums-api/src/java/org/sakaiproject/api/app/messageforums/ui/PrivateMessageManager.java
    • -0
    • +121
    /msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/DraftRecipientsDelegate.java
    • -2
    • +22
    /msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
    • -0
    • +1
    /msgcntr/messageforums-app/src/webapp/jsp/compose.jsp
    • -0
    • +20
    /msgcntr/messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/MessageForumsMessageManagerImpl.java
    • -14
    • +26
    /msgcntr/messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/ui/PrivateMessageManagerImpl.java
    • -0
    • +5
    /msgcntr/messageforums-component-impl/src/webapp/WEB-INF/components.xml