lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
Last Commit:
Commits this week: 0

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
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 05 Nov 2019
4:51 am

Marcin Cieslak

LDEV-4898 Fix notifyCloseURL passing in Scratchie

Options
    • -1
    • +12
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -1
    • +1
    /lams_tool_scratchie/web/pages/authoring/start.jsp
4:51 am

Marcin Cieslak

LDEV-4898 Fix race condition when generating a LD SVG

Options
    • -9
    • +10
    /lams_central/web/includes/javascript/main.js
Monday 04 Nov 2019
4:30 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
4:27 pm

Marcin Cieslak

Merge branch 'LDEV-4899'

Options
4:26 pm

Marcin Cieslak

LDEV-4899 Fix Kumalive rubrics saving

Options
    • -2
    • +1
    /lams_learning/web/kumalive/kumaliveRubrics.jsp
4:16 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
4:11 pm

Marcin Cieslak

Merge branch 'LDEV-4893'

Options
4:10 pm

Marcin Cieslak

LDEV-4893 Current activity opens in a pop up in monitor progress bar

Options
    • -1
    • +3
    /lams_central/web/includes/javascript/progressBar.js
Saturday 02 Nov 2019
2:08 am

Andrey Balan

Merge branch 'master' into develop

Conflicts:

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_el_GR.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

Options
    • -19
    • +27
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -96
    • +15
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -26
    • +25
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
    • -22
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
1:41 am

Andrey Balan

LDEV-4897 Update Gradebook, Kumalive, and archived emails to use new Excel exporting methods

Options
    • -1
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/util/excel/ExcelRow.java
    • -344
    • +284
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -4
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java
    • -21
    • +0
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -8
    • +8
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
    • -4
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveController.java
    • -2
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -90
    • +78
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -1
    • +2
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -31
    • +23
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +3
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
Thursday 31 Oct 2019
10:54 pm

Andrey Balan

LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

Options
    • -5
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/util/excel/ExcelCell.java
    • -1
    • +24
    /lams_common/src/java/org/lamsfoundation/lams/util/excel/ExcelRow.java
    • -0
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/util/excel/ExcelSheet.java
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/util/excel/ExcelUtil.java
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -3
    • +0
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
    • -1
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveController.java
    • -5
    • +6
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
    • -77
    • +42
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -10
    • +17
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -5
    • +5
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java
    • -1
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -276
    • +215
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -5
    • +7
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -39
    • +24
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -4
    • +6
    /lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp
3:58 pm

Andrey Balan

LDEV-4858 Take care about percentages

Options
    • -0
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/util/excel/ExcelRow.java
    • -84
    • +32
    /lams_common/src/java/org/lamsfoundation/lams/util/excel/ExcelUtil.java
3:58 pm

Andrey Balan

LDEV-4897 Roll back to the previous calculation

Options
    • -19
    • +32
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
12:35 am

Andrey Balan

LDEV-4897 Introduce ExcelRow and ExcelSheet classes

* Update Daco and Assessment to use new classes

* Move existing ExcelCell and ExcelUtils to .util.excel package

Options
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
    • -134
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/util/ExcelCell.java
    • -463
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/util/ExcelUtil.java
    • -0
    • +134
    /lams_common/src/java/org/lamsfoundation/lams/util/excel/ExcelCell.java
    • -0
    • +56
    /lams_common/src/java/org/lamsfoundation/lams/util/excel/ExcelRow.java
    • -0
    • +38
    /lams_common/src/java/org/lamsfoundation/lams/util/excel/ExcelSheet.java
    • -0
    • +482
    /lams_common/src/java/org/lamsfoundation/lams/util/excel/ExcelUtil.java
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -2
    • +2
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveController.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
  16. … 18 more files in changeset.
Wednesday 30 Oct 2019
5:15 pm

Marcin Cieslak

Merge branch 'LDEV-4895' into LDEV-4745

Options
6:08 am

Andrey Balan

LDEV-4858 Set marks and other numeric values as numbers

Options
    • -4
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/util/ExcelCell.java
    • -17
    • +29
    /lams_common/src/java/org/lamsfoundation/lams/util/ExcelUtil.java
Tuesday 29 Oct 2019
6:06 pm

Marcin Cieslak

LDEV-4895 Fix correct option setting in Scratchie

Options
    • -3
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
5:59 pm

Marcin Cieslak

LDEV-4895 Fix learner answer recalculation in Scratchie after QB edit

Options
    • -29
    • +25
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
5:40 pm

Marcin Cieslak

LDEV-4875 Fix JS validation after field name change

Options
    • -5
    • +5
    /lams_tool_scratchie/web/pages/authoring/parts/addMcq.jsp
1:09 pm

Ernie Ghiglione

LDEV-4769 Updating translations

Options
    • -21
    • +29
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +15
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -27
    • +26
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
4:35 am

Andrey Balan

LDEV-4896 Add groupings to the course instead of subcourse

Options
    • -16
    • +15
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java
Monday 28 Oct 2019
5:36 pm

Marcin Cieslak

LDEV-4895 Fix detection whether MCQ has already been attempted

Options
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -5
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
Sunday 27 Oct 2019
4:26 am

Andrey Balan

Merge branch 'master' into develop

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -2
    • +6
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
Saturday 26 Oct 2019
8:59 am

Ernie Ghiglione

LDEV-4769 Updating translations

Options
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -4
    • +13
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
8:53 am

Ernie Ghiglione

LDEV-4769 Update translations

Options
    • -2
    • +13
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -2
    • +17
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +11
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +13
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
4:37 am

Andrey Balan

Merge branch 'master' into develop

Options
4:36 am

Andrey Balan

LDEV-4858 Set marks and other numeric values as numbers

Options
    • -56
    • +58
    /lams_common/src/java/org/lamsfoundation/lams/util/ExcelUtil.java
3:20 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
3:19 am

Andrey Balan

Merge branch 'LDEV-4859'

Options
3:19 am

Andrey Balan

LDEV-4859 Include time with dates

Options
    • -11
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/util/ExcelCell.java
    • -13
    • +64
    /lams_common/src/java/org/lamsfoundation/lams/util/ExcelUtil.java
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -64
    • +70
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java