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
Thursday 04 Feb 2021
3:22 pm

Ernie Ghiglione

LDEV-4769 Updating English, Norwegian and Greek

Options
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +23
    /lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +12
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +7
    /lams_tool_doku/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +3
    /lams_tool_doku/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +4
    /lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties
  16. … 12 more files in changeset.
2:46 pm

Marcin Cieslak

LDEV-5145 Move doKu creation to AE new question dropdown

Options
    • -2
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +0
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +6
    /lams_central/web/authoring/template/tbl/appexAssessment.jsp
    • -22
    • +26
    /lams_central/web/authoring/template/tbl/tbl.jsp
1:29 am

Marcin Cieslak

LDEV-5145 Add doKu gallery walk support in TBL template

Options
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -0
    • +10
    /lams_central/web/authoring/template/tbl/appexDoku.jsp
    • -0
    • +1
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
1:17 am

Marcin Cieslak

LDEV-5145 Introduce Doku AE in TBL template back-end

Options
    • -16
    • +45
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -14
    • +38
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -1
    • +2
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
12:18 am

Marcin Cieslak

LDEV-5145 Introduce Doku AE in TBL template front-end

Options
    • -1
    • +6
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -7
    • +10
    /lams_central/web/authoring/template/tbl/appexAssessment.jsp
    • -0
    • +95
    /lams_central/web/authoring/template/tbl/appexDoku.jsp
    • -8
    • +14
    /lams_central/web/authoring/template/tbl/tbl.jsp
Wednesday 03 Feb 2021
6:41 pm

Marcin Cieslak

LDEV-5145 Improve Assessment AE code formating

Options
    • -77
    • +122
    /lams_central/web/authoring/template/tbl/appexAssessment.jsp
6:30 pm

Marcin Cieslak

LDEV-5145 Rename Assessment AE file to distinguis from Doku AE

Options
    • -106
    • +0
    /lams_central/web/authoring/template/tbl/appex.jsp
    • -0
    • +106
    /lams_central/web/authoring/template/tbl/appexAssessment.jsp
Tuesday 02 Feb 2021
8:29 pm

Ernie Ghiglione

LDEV-5165 Adding missing email verification labels that were missing for a while

Options
    • -3
    • +3
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +4
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
8:23 pm

Ernie Ghiglione

LDEV-5143 Updating labels for doKu

Options
    • -0
    • +2
    /lams_tool_doku/conf/language/lams/ApplicationResources_es_ES.properties
8:23 pm

Ernie Ghiglione

LDEV-4553 Adding missing label for Q&A

Options
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_tool_laqa/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties
7:22 pm

Marcin Cieslak

Merge branch 'LDEV-5166' into v4.0

Options
7:22 pm

Marcin Cieslak

LDEV-5166 Add Learning Design description to monitoring

Lesson description is called "intro" and learning design description is

just "description"

Options
    • -15
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java
    • -0
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -1
    • +1
    /lams_monitoring/web/css/_monitorLesson_base.scss
    • -1
    • +2
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -3
    • +17
    /lams_monitoring/web/monitor.jsp
6:47 pm

Marcin Cieslak

Merge branch 'LDEV-5163' into v4.0

Options
6:46 pm

Marcin Cieslak

LDEV-5163 Reintroduce code that restarts lesson on each learner entry

Options
    • -3
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
4:44 pm

Ernie Ghiglione

LDEV-5164 Switch buttons when choosing branching in preview

Options
    • -2
    • +2
    /lams_learning/web/branching/preview.jsp
10:08 am

Ernie Ghiglione

LDEV-4553 Updating labels

Options
    • -5
    • +5
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -5
    • +5
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +2
    /lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
10:07 am

Ernie Ghiglione

LDEV-5143 labels

Options
    • -0
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_doku/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    /lams_tool_doku/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_laqa/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +4
    /lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +2
    /lams_tool_leader/conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    /lams_tool_leader/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +5
    /lams_tool_leader/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
  16. … 7 more files in changeset.
12:00 am

Marcin Cieslak

Merge branch 'LDEV-5162' into v4.0

Options
12:00 am

Marcin Cieslak

LDEV-5162 Fix Ordering answers saving to DB

To reflect an order that a learner put his answers, a TreeSet was used.

Its comparing function uses displayOrder.

It works fine when elements are put into the set during the first save,

i.e. the first autosave or a submit before the first autosave.

But when another save occurs (another autosave or a submit after the

first autosave), the set of answers is not recreated. Only displayOrder

of answers is modified. But TreeSet is not aware of it and keeps old

ordering. The iteration that happens during the save picks up answers in

the old order.

The fix uses real displayOrder value instead of counting on correct

order in TreeSet.

Another solution would be to rebuild the set after modifying answers'

displayOrder.

Options
    • -2
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Monday 01 Feb 2021
9:11 pm

Marcin Cieslak

Merge branch 'LDEV-5143' into v4.0

Conflicts:

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

Options
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +19
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/GradeStatsDTO.java
    • -0
    • +79
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +20
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -0
    • +11
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -15
    • +66
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
    • -0
    • +3
    /lams_tool_doku/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_laqa/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_vote/conf/language/lams/ApplicationResources.properties
12:44 pm

Ernie Ghiglione

LDEV-5143 and LDEV-5140 labels updates

Options
    • -1
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_laqa/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_leader/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
  16. … 7 more files in changeset.
11:17 am

Ernie Ghiglione

LDEV-5140 adjusting font size

Options
    • -1
    • +1
    /lams_www/web/gradebookReleaseLessonMarksEmailTemplate.html
6:40 am

Marcin Cieslak

Merge branch 'LDEV-5158' into LDEV-5143

Options
6:40 am

Marcin Cieslak

LDEV-5158 Fix description validation on Submit Files front end

Options
    • -1
    • +1
    /lams_tool_sbmt/web/learner/sbmtlearner.jsp
6:33 am

Marcin Cieslak

Merge branch 'LDEV-5161' into LDEV-5143

Options
6:32 am

Marcin Cieslak

LDEV-5161 After leader change always redirect to main learner URL

Options
    • -1
    • +2
    /lams_tool_sbmt/web/learner/sbmtlearner.jsp
5:54 am

Marcin Cieslak

Merge branch 'LDEV-5160' into LDEV-5143

Options
5:53 am

Marcin Cieslak

LDEV-5160 Fix an exception when removing content of leader

Options
    • -0
    • +5
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
5:40 am

Marcin Cieslak

Merge branch 'LDEV-5159' into LDEV-5143

Options
5:40 am

Marcin Cieslak

LDEV-5159 Refresh Assessment monitoring after leader change

Options
    • -0
    • +1
    /lams_tool_assessment/web/pages/monitoring/summary.jsp