lams-github

lams_tool_lamc

Clone Tools

Stats

Commits this week: 0
Total Committers: 27
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
Monday 16 Dec 2019
1:37 pm

Marcin Cieslak

LDEV-4884 Store MCQ questions' UUIDs in JSON so Scratchie can use them

Options
    • -1
    • +12
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 1 more file in changeset.
Wednesday 11 Dec 2019
5:26 pm

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_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -2
    • +18
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 16 more files in changeset.
Tuesday 10 Dec 2019
10:56 pm

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
    • -1
    • +1
    ./web/learning/ViewAnswers.jsp
  2. … 10 more files in changeset.
10:05 pm

Andrey Balan

LDEV-4927 Add padding to confidence widget

Options
    • -1
    • +1
    ./web/learning/ViewAnswers.jsp
3:31 pm

Marcin Cieslak

LDEV-4921 Hide question titles in TBL monitoring IRA

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/TblMonitoringController.java
    • -83
    • +85
    ./web/tblmonitoring/mcq.jsp
Monday 09 Dec 2019
2:19 pm

Ernie Ghiglione

LDEV-4745 Updating labels

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

Ernie Ghiglione

LDEV-4769 updating labels

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

Options
    • -2
    • +18
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +18
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +18
    ./conf/language/lams/ApplicationResources_es_ES.properties
  5. … 62 more files in changeset.
Saturday 07 Dec 2019
12:09 pm

Ernie Ghiglione

LDEV-4745 adding missing labels to tools

Scratchie, QA, MC and assessment

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
  2. … 3 more files in changeset.
Friday 06 Dec 2019
7:32 am

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

lams_tool_laqa/web/learning/Notebook.jsp

lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

Options
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 10 more files in changeset.
6:54 am

Marcin Cieslak

LDEV-4786 Add missing labels

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
  2. … 2 more files in changeset.
Thursday 05 Dec 2019
2:51 pm

Marcin Cieslak

LDEV-4921 Fix a label

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
2:41 pm

Marcin Cieslak

LDEV-4921 Add question numbering in Authoring for MCQ

Options
    • -0
    • +6
    ./web/authoring/itemlist.jsp
2:41 pm

Marcin Cieslak

LDEV-4921 Hide question titles in Learner for MCQ

Options
    • -4
    • +7
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -2
    • +4
    ./web/learning/CombinedAnswersContent.jsp
    • -2
    • +4
    ./web/learning/SingleQuestionAnswersContent.jsp
    • -2
    • +4
    ./web/learning/ViewAnswers.jsp
2:20 pm

Marcin Cieslak

LDEV-4921 Introduce MCQ admin page. Allow hiding question titles.

Options
    • -247
    • +253
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcConfigDAO.java
    • -0
    • +20
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McConfigDAO.java
    • -0
    • +23
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20191205.sql
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -3
    • +19
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +61
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McAdminController.java
    • -0
    • +35
    ./src/java/org/lamsfoundation/lams/tool/mc/web/form/McAdminForm.java
    • -0
    • +38
    ./web/admin/config.jsp
12:18 am

Marcin Cieslak

LDEV-4920 Import QTI questions to Scratchie after adding them to QB

Options
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -0
    • +1
    ./web/authoring/BasicContent.jsp
  3. … 3 more files in changeset.
Wednesday 04 Dec 2019
2:44 pm

Marcin Cieslak

LDEV-4920 Import QTI questions to MCQ after adding them to QB

Options
    • -2
    • +16
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -0
    • +35
    ./web/authoring/BasicContent.jsp
    • -3
    • +0
    ./web/authoring/itemlist.jsp
  4. … 6 more files in changeset.
Tuesday 03 Dec 2019
8:44 pm

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties

# lams_monitoring/conf/language/lams/ApplicationResources.properties

# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_chat/conf/language/lams/ApplicationResources.properties

# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_daco/conf/language/lams/ApplicationResources.properties

# lams_tool_daco/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_forum/conf/language/lams/ApplicationResources.properties

# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_images/conf/language/lams/ApplicationResources.properties

# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_leader/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_preview/conf/language/lams/ApplicationResources.properties

# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 34 more files in changeset.
Monday 02 Dec 2019
2:06 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating all labels (Greek, English, Spanish, Norwegian)

Options
    • -3
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +10
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +5
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +10
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 118 more files in changeset.
7:09 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Adding ides to test monitor starting new lesson

Options
    • -1
    • +1
    ./web/authoring/editQuestionBox.jsp
    • -2
    • +2
    ./web/authoring/itemlist.jsp
  3. … 3 more files in changeset.
Saturday 30 Nov 2019
6:42 am

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java
  4. … 1 more file in changeset.
Wednesday 27 Nov 2019
9:26 am

Marcin Cieslak

LDEV-4916 Static fields can not be autowired

Spring does not support it.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java
  5. … 6 more files in changeset.
Monday 25 Nov 2019
6:34 pm

Andrey Balan

LDEV-4861 Prevent adding the same question twice

Options
    • -0
    • +24
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
  2. … 5 more files in changeset.
Friday 22 Nov 2019
6:51 pm

Andrey Balan

LDEV-4880 Add confidence level variations

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 19 more files in changeset.
Thursday 21 Nov 2019
9:12 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Create structure for monitoring learning

Options
    • -2
    • +2
    ./web/authoring/itemlist.jsp
  2. … 4 more files in changeset.
Tuesday 19 Nov 2019
2:43 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

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

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

lams_tool_scratchie/web/pages/learning/learning.jsp

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -20
    • +41
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -12
    • +20
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -4
    • +4
    ./web/learning/AnswersContent.jsp
  6. … 17 more files in changeset.
Thursday 14 Nov 2019
3:02 pm

Marcin Cieslak

LDEV-4900 Make other tools react to autosave command

Options
    • -4
    • +4
    ./web/learning/AnswersContent.jsp
  2. … 2 more files in changeset.
2:28 pm

Marcin Cieslak

LDEV-4900 Distribute modified Page tag to all tools

Options
    • -1
    • +11
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
Tuesday 12 Nov 2019
8:32 pm

Andrey Balan

LDEV-4900 Update Gradebook marks of non-leaders on leader finish

* Gradebook now pushes updated marks to LTI consumer. It happens only if

user has finished the lesson

Options
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 60 more files in changeset.
Friday 08 Nov 2019
11:00 pm

Andrey Balan

LDEV-4900 Fix issues

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  5. … 1 more file in changeset.
4:29 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_central/web/main.jsp

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

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

lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

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

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

lams_tool_scratchie/web/pages/authoring/start.jsp

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -14
    • +21
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -0
    • +10
    ./web/authoring/itemlist.jsp
  4. … 25 more files in changeset.