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
Wednesday 11 Dec 2019
5:56 am

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

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

# lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

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

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

Options
    • -4
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -4
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -335
    • +330
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
    • -1
    • +1
    /lams_tool_lamc/web/learning/ViewAnswers.jsp
    • -1
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
    • -121
    • +8
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java
    • -1
    • +16
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java
    • -1
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/LearningUtil.java
    • -125
    • +38
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
    • -140
    • +178
    /lams_tool_laqa/web/learning/LearnerRep.jsp
    • -16
    • +8
    /lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
5:06 am

Andrey Balan

Merge branch 'LDEV-4927' into develop

Options
5:05 am

Andrey Balan

LDEV-4927 Add padding to confidence widget

Options
    • -1
    • +1
    /lams_tool_lamc/web/learning/ViewAnswers.jsp
5:05 am

Andrey Balan

LDEV-4927 Show other users' answers right after user answers

* Some minor tweaks in monitor pages

Options
    • -1
    • +0
    /lams_central/web/css/_jquery.jRating_base.scss
    • -1
    • +0
    /lams_central/web/css/_learner_base.scss
    • -44
    • +3
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java
    • -0
    • +15
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java
    • -1
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/LearningUtil.java
    • -12
    • +21
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
    • -99
    • +113
    /lams_tool_laqa/web/learning/LearnerRep.jsp
    • -16
    • +8
    /lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
Tuesday 10 Dec 2019
10:31 pm

Marcin Cieslak

LDEV-4921 Hide question titles in TBL monitoring IRA

Options
    • -0
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/TblMonitoringController.java
    • -83
    • +85
    /lams_tool_lamc/web/tblmonitoring/mcq.jsp
10:24 pm

Marcin Cieslak

LDEV-4921 Hide question titles in TBL monitoring burning questions

Options
    • -1
    • +8
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -1
    • +4
    /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
10:19 pm

Marcin Cieslak

LDEV-4921 Hide question titles in Scratchie monitoring burning questions

Options
    • -2
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -1
    • +3
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
7:09 pm

Marcin Cieslak

LDEV-4921 Hide question titles in Scratchie burning questions

Options
    • -1
    • +19
    /lams_tool_scratchie/web/pages/learning/results.jsp
    • -6
    • +6
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
5:24 am

Andrey Balan

LDEV-4927 Stop using "RevisitedLearnerRep.jsp" page

* Remove redundant form fields

Options
    • -4
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
    • -80
    • +5
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java
    • -4
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java
    • -143
    • +22
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
    • -311
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaLearningForm.java
    • -52
    • +73
    /lams_tool_laqa/web/learning/LearnerRep.jsp
    • -479
    • +0
    /lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
Monday 09 Dec 2019
9:38 pm

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -3
    • +3
    /lams_tool_wiki/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_wiki/conf/language/lams/ApplicationResources_es_ES.properties
9:37 pm

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -3
    • +3
    /lams_tool_vote/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_vote/conf/language/lams/ApplicationResources_es_ES.properties
9:35 pm

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -3
    • +4
    /lams_tool_task/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_task/conf/language/lams/ApplicationResources_es_ES.properties
9:30 pm

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -3
    • +3
    /lams_tool_survey/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_survey/conf/language/lams/ApplicationResources_es_ES.properties
9:29 pm

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -3
    • +3
    /lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_spreadsheet/conf/language/lams/ApplicationResources_es_ES.properties
9:27 pm

Ernie Ghiglione

LDEV-4745 adding new labels

Options
    • -15
    • +17
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -3
    • +21
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
    • -12
    • +17
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
9:26 pm

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -3
    • +3
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties
9:25 pm

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -3
    • +3
    /lams_tool_pixlr/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_pixlr/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    /lams_tool_pixlr/conf/language/lams/ApplicationResources_es_ES.properties
9:23 pm

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -3
    • +3
    /lams_tool_notebook/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_notebook/conf/language/lams/ApplicationResources_es_ES.properties
9:22 pm

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -3
    • +3
    /lams_tool_nb/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_nb/conf/language/lams/ApplicationResources_es_ES.properties
9:22 pm

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -3
    • +4
    /lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_mindmap/conf/language/lams/ApplicationResources_es_ES.properties
9:21 pm

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -7
    • +6
    /lams_tool_laqa/conf/language/lams/ApplicationResources.properties
    • -5
    • +6
    /lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +5
    /lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties
9:19 pm

Ernie Ghiglione

LDEV-4745 Updating labels

Options
    • -14
    • +16
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    /lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties
    • -13
    • +16
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +18
    /lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties
9:18 pm

Ernie Ghiglione

LDEV-4745 adding new labels

Options
    • -15
    • +13
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +25
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -12
    • +13
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
9:16 pm

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -4
    • +4
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    /lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
9:15 pm

Ernie Ghiglione

LDEV-4745 adding new labels

Options
    • -6
    • +6
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -3
    • +6
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -25
    • +42
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
9:10 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating labels across all modules. Mainly Greek, Norwegian, Español and English

Options
    • -3
    • +3
    /lams_tool_scribe/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_tool_scribe/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_scribe/conf/language/lams/ApplicationResources_es_ES.properties
9:01 pm

Marcin Cieslak

LDEV-4844 Add missing labels

Options
    • -0
    • +2
    /lams_admin/conf/language/lams/ApplicationResources.properties
7:59 pm

Marcin Cieslak

LDEV-4920 Use correct ID when informing which questions were imported

Options
    • -2
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
7:57 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating labels across all modules. Mainly Greek, Norwegian, Español and English

Options
    • -2
    • +3
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -3
    • +19
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -25
    • +39
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +3
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +16
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +25
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +16
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +18
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    /lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +18
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +18
    /lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties
  16. … 51 more files in changeset.
7:37 pm

Ernie Ghiglione

LDEV-4769 updating labels

Greek and English

Options
    • -4
    • +7
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +6
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties