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 22 May 2018
3:04 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

Options
    • -17
    • +3
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -17
    • +4
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -76
    • +63
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -5
    • +5
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -5
    • +5
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -17
    • +17
    /lams_gradebook/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -16
    • +16
    /lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
    • -32
    • +32
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
    • -4
    • +4
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -17
    • +17
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -9
    • +9
    /lams_tool_bbb/conf/language/lams/ApplicationResources_es_ES.properties
    • -9
    • +7
    /lams_tool_chat/conf/language/lams/ApplicationResources_es_ES.properties
  16. … 34 more files in changeset.
11:23 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4459: small formatting change

Options
    • -2
    • +2
    /lams_monitoring/web/emailnotifications/lessonNotifications.jsp
Monday 21 May 2018
11:21 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Adding template labels

Previously removed by accidents as they aren't in i18n yet

Options
    • -0
    • +54
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +54
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
11:10 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels

Options
    • -60
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -58
    • +2
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -62
    • +385
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +7
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -5
    • +156
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_chat/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_daco/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties
    • -4
    • +4
    /lams_tool_gmap/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_images/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_imscc/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +2
    /lams_tool_mindmap/conf/language/lams/ApplicationResources_es_ES.properties
  16. … 11 more files in changeset.
7:03 pm

Marcin Cieslak

LDEV-4587 Silence i18n warning as they are not that important

Options
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java
7:03 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

Options
    • -70
    • +137
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +8
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -3
    • +3
    /lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +8
    /lams_gradebook/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +29
    /lams_learning/conf/language/lams/ApplicationResources_el_GR.properties
    • -4
    • +78
    /lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +30
    /lams_learning/conf/language/lams/ApplicationResources_no_NO.properties
    • -4
    • +5
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -26
    • +74
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +10
    /lams_tool_assessment/conf/language/lams/ApplicationResources_no_NO.properties
    • -24
    • +9
    /lams_tool_chat/conf/language/lams/ApplicationResources_es_ES.properties
    • -21
    • +12
    /lams_tool_daco/conf/language/lams/ApplicationResources_es_ES.properties
    • -14
    • +18
    /lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +6
    /lams_tool_forum/conf/language/lams/ApplicationResources_no_NO.properties
    • -6
    • +9
    /lams_tool_gmap/conf/language/lams/ApplicationResources_es_ES.properties
  16. … 24 more files in changeset.
7:01 pm

Marcin Cieslak

LDEV-4587 Select branch based on option order chosen by learner

A condition has a question sequence ID and an option sequence ID encoded

in its name. This way we know what output to produce. Then all outputs

are sorted and a branch which was not processed yet gets chosen.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -11
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -0
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
    • -4
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -3
    • +23
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -12
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -24
    • +79
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
Friday 18 May 2018
6:43 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java

lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java

Options
    • -16
    • +51
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -6
    • +23
    /lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java
    • -1
    • +22
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -3
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -45
    • +68
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
    • -4
    • +20
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -1
    • +38
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -18
    • +42
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -25
    • +48
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
  16. … 8 more files in changeset.
5:41 pm

Marcin Cieslak

LDEV-4587 Add new assessment output type

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -3
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -3
    • +26
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
1:05 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4585 Activity names in Greek appear properly in export file.

Options
    • -3
    • +21
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -9
    • +10
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +2
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
10:41 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4586 Letter prefixes shown on results page

Options
    • -3
    • +6
    /lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp
2:02 am

Andrey Balan

LKC-137 Add Save/Cancel buttons for jqGrid inline editing

Options
    • -2
    • +43
    /lams_tool_scratchie/web/pages/learning/results.jsp
Thursday 17 May 2018
7:58 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4582 Set default value for the new Prefix column

Options
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180515.sql
5:42 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek and English

Options
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
Wednesday 16 May 2018
9:01 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'LDEV-4582'

Options
7:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4582 Able to add letter prefix to Assessment MCQ Answers

Options
    • -0
    • +9
    /lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180515.sql
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/OptionDTO.java
    • -0
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -0
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -0
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -0
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java
    • -0
    • +8
    /lams_tool_assessment/web/includes/css/assessment.scss
    • -1
    • +35
    /lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
    • -3
    • +6
    /lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
3:23 am

Andrey Balan

Merge branch 'LDEV-4583'

Options
    • binary
    /lams_build/lib/lams/lams.jar
3:23 am

Andrey Balan

LDEV-4583 Block access to index.do for integration learners

If user comes from integrations and possess only learner rights we

should not allow him/her to access index.do page.

Options
    • -0
    • +21
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
Tuesday 15 May 2018
8:41 pm

Andrey Balan

LDEV-4569 add support for LKC TBL monitoring case

There is a special case, used for LKC TBL monitoring only, when

learning design doesn't contain Scratchie activities. In this case

all Assessments should be shown as AEs.

Options
    • -3
    • +16
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
1:10 am

Andrey Balan

LDEV-4569 use jquery toggle instead of bootstrap collapse

By some reason bootstrap collapse doesn't work properly. Involved

links got assigned double amount of click handlers which makes

them appear and then instantaneously disappear again.

Options
    • -0
    • +4
    /lams_monitoring/web/css/_tblmonitor_base.scss
    • -1
    • +10
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
Monday 14 May 2018
9:28 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4577: minor UI improvement

Adding a heading to feedback options in advanced tab authoring

Options
    • -1
    • +1
    /lams_tool_lamc/web/authoring/AdvancedContent.jsp
8:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4577 Can now just show feedback without showing answers.

Options
    • -1
    • +9
    /lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml
    • -4
    • +10
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +14
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180511.sql
    • -3
    • +13
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McGeneralLearnerFlowDTO.java
    • -0
    • +9
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McGeneralMonitoringDTO.java
    • -3
    • +14
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -7
    • +12
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningStarterAction.java
    • -1
    • +22
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -1
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringStarterAction.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McStarterAction.java
    • -5
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McAuthoringForm.java
  16. … 4 more files in changeset.
Friday 11 May 2018
3:09 pm

Marcin Cieslak

Merge branch 'LDEV-4580'

Options
3:09 pm

Marcin Cieslak

LDEV-4580, LDEV-4497 Fix content dir path when exporting/importing LD

Options
    • -3
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
2:36 pm

Marcin Cieslak

Merge branch 'LDEV-4581'

Options
2:35 pm

Marcin Cieslak

LDEV-4581 QTI export now parses images with names with whitespace

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionExporter.java
10:40 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4569: fixing label

Options
    • -2
    • +2
    /lams_monitoring/web/monitor.jsp
10:33 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4454 Adding labels for kumalive polls in i18n

Options
    • -35
    • +32
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -4
    • +31
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
Thursday 10 May 2018
4:42 pm

Andrey Balan

LDEV-4569 Change burning questions' heading collapse icon

Options
    • -2
    • +2
    /lams_monitoring/web/css/_tblmonitor_base.scss
4:00 pm

Marcin Cieslak

Merge branch 'LDEV-4579'

Options