lams-github

lams_tool_laqa

Clone Tools

Stats

Commits this week: 0
Total Committers: 29
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 09 Jan 2020
8:59 am

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

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

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

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

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

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

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

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

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# 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/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

Options
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
    • -6
    • +22
    ./src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
    • -27
    • +10
    ./src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java
    • -2
    • +3
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +2
    ./web/authoring/AuthoringTabsHolder.jsp
    • -6
    • +10
    ./web/authoring/conditions.jsp
    • -1
    • +2
    ./web/authoring/newQuestionBox.jsp
    • -24
    • +1
    ./web/monitoring/MonitoringMaincontent.jsp
  9. … 87 more files in changeset.
Saturday 04 Jan 2020
3:59 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF for QA authoring

- Add/edit questions

- remove questions

- Add and remove conditions

Options
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
    • -1
    • +2
    ./web/authoring/addCondition.jsp
    • -6
    • +10
    ./web/authoring/conditions.jsp
    • -2
    • +3
    ./web/authoring/newQuestionBox.jsp
  6. … 1 more file in changeset.
Friday 03 Jan 2020
7:59 am

Marcin Cieslak

LDEV-4743 Squash tool patches updating to version 3.1

Options
    • -20
    • +0
    ./src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20180425.sql
    • -22
    • +0
    ./src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20180729.sql
    • -18
    • +0
    ./src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20180926.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20181202.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20190103.sql
    • -0
    • +51
    ./src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20190103_updateTo31.sql
  7. … 113 more files in changeset.
Thursday 02 Jan 2020
2:12 pm

Ernie Ghiglione

LDEV-4932 Add CSRF to OutcomeAuthor tag

Options
    • -2
    • +3
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 30 more files in changeset.
Wednesday 01 Jan 2020
12:43 am

Ernie Ghiglione

LDEV-4932 Passing CSRF token as a post rather than get

Options
    • -2
    • +2
    ./web/authoring/AuthoringTabsHolder.jsp
  2. … 41 more files in changeset.
Monday 30 Dec 2019
10:14 pm

Andrey Balan

LDEV-4932 Secure save tool authoring with CSRF Guard

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
    • -1
    • +2
    ./web/authoring/AuthoringTabsHolder.jsp
  3. … 41 more files in changeset.
Friday 27 Dec 2019
7:23 pm

Andrey Balan

LDEV-4932 Secure edit in monitor with CSRF Guard

* In order to secure /definelater.do path, added definelater() method to

AuthoringController to the tools missing it

* Remove unnecessary forms from monitor in Vote, NB, QA tools

Options
    • -7
    • +22
    ./src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
    • -18
    • +5
    ./src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java
    • -101
    • +0
    ./src/java/org/lamsfoundation/lams/tool/qa/web/form/QaMonitoringForm.java
    • -7
    • +8
    ./web/monitoring/Edit.jsp
    • -24
    • +1
    ./web/monitoring/MonitoringMaincontent.jsp
  6. … 105 more files in changeset.
Tuesday 24 Dec 2019
10:47 pm

Andrey Balan

LDEV-4932 Secure setting submission deadline with CSRF Guard

Options
    • -13
    • +6
    ./src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java
    • -0
    • +70
    ./web/WEB-INF/tlds/security/csrfguard.tld
    • -2
    • +15
    ./web/WEB-INF/web.xml
    • -0
    • +1
    ./web/common/taglibs.jsp
    • -1
    • +1
    ./web/monitoring/MonitoringMaincontent.jsp
  6. … 59 more files in changeset.
Thursday 19 Dec 2019
8:42 pm

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

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

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

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

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

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

# lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

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

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

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

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

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

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# 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_en_AU.properties

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

# lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

# lams_tool_laqa/web/learning/IndividualLearnerResults.jsp

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

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

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

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

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

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

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

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

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

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

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

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

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

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

# lams_tool_pixlr/conf/language/lams/ApplicationResources_es_ES.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_el_GR.properties

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Options
    • -10
    • +13
    ./src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
    • -6
    • +7
    ./web/learning/CombinedAnswersContent.jsp
    • -1
    • +1
    ./web/learning/LearnerRep.jsp
    • -6
    • +5
    ./web/learning/SequentialAnswersContent.jsp
  5. … 13 more files in changeset.
Wednesday 18 Dec 2019
11:21 pm

Andrey Balan

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

Options
    • -10
    • +13
    ./src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
  2. … 42 more files 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
    • -4
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./web/learning/LearnerRep.jsp
  3. … 16 more files in changeset.
Tuesday 10 Dec 2019
10:59 pm

Andrey Balan

LDEV-4927 Add "min-height" property to rating widget

Options
    • -1
    • +5
    ./web/learning/LearnerRep.jsp
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
    • +0
    ./src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
    • -121
    • +8
    ./src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java
    • -1
    • +16
    ./src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/qa/util/LearningUtil.java
    • -125
    • +38
    ./src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
    • -140
    • +178
    ./web/learning/LearnerRep.jsp
    • -16
    • +8
    ./web/monitoring/MonitoringMaincontent.jsp
  8. … 4 more files in changeset.
10:05 pm

Andrey Balan

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

* Some minor tweaks in monitor pages

Options
    • -44
    • +3
    ./src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/qa/util/LearningUtil.java
    • -12
    • +21
    ./src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
    • -99
    • +113
    ./web/learning/LearnerRep.jsp
    • -16
    • +8
    ./web/monitoring/MonitoringMaincontent.jsp
  7. … 2 more files in changeset.
Monday 09 Dec 2019
10:24 pm

Andrey Balan

LDEV-4927 Stop using "RevisitedLearnerRep.jsp" page

* Remove redundant form fields

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

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -7
    • +6
    ./conf/language/lams/ApplicationResources.properties
    • -5
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +5
    ./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
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 63 more files in changeset.
Sunday 08 Dec 2019
7:32 pm

Ernie Ghiglione

LDEV-4927 Improvements to Q&A UI

1) Only show question numbering if there's more than one question.

2) Improve warnings about answer requirements and word count required

3) Make use of placeholder for "Your answer" instead.

Options
    • -10
    • +8
    ./web/learning/CombinedAnswersContent.jsp
    • -4
    • +4
    ./web/learning/IndividualLearnerResults.jsp
    • -2
    • +2
    ./web/learning/LearnerRep.jsp
    • -2
    • +2
    ./web/learning/RevisitedLearnerRep.jsp
    • -10
    • +9
    ./web/learning/SequentialAnswersContent.jsp
    • -4
    • +4
    ./web/monitoring/SummaryContent.jsp
2:46 pm

Ernie Ghiglione

LDEV-4927 Improvements to Q&A UI

1) Only show question numbering if there's more than one question.

2) Improve warnings about answer requirements and word count required

3) Make use of placeholder for "Your answer" instead.

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -13
    • +15
    ./web/learning/CombinedAnswersContent.jsp
    • -4
    • +7
    ./web/learning/IndividualLearnerResults.jsp
    • -8
    • +11
    ./web/learning/LearnerRep.jsp
    • -5
    • +3
    ./web/learning/RevisitedLearnerRep.jsp
    • -10
    • +10
    ./web/learning/SequentialAnswersContent.jsp
Saturday 07 Dec 2019
12:09 pm

Ernie Ghiglione

LDEV-4745 adding missing labels to tools

Scratchie, QA, MC and assessment

Options
    • -0
    • +2
    ./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
    • -11
    • +8
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +0
    ./web/learning/AnswersContent.jsp
    • -8
    • +0
    ./web/learning/CombinedAnswersContent.jsp
    • -28
    • +23
    ./web/learning/Notebook.jsp
    • -11
    • +0
    ./web/learning/SequentialAnswersContent.jsp
  6. … 7 more files in changeset.
Thursday 05 Dec 2019
4:41 pm

Andrey Balan

LDEV-4919 Don't focus on question answer

Options
    • -1
    • +0
    ./web/learning/AnswersContent.jsp
    • -17
    • +8
    ./web/learning/CombinedAnswersContent.jsp
    • -29
    • +23
    ./web/learning/Notebook.jsp
    • -19
    • +3
    ./web/learning/SequentialAnswersContent.jsp
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
    • +6
    ./conf/language/lams/ApplicationResources.properties
  2. … 35 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
    • -2
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -40
    • +11
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -40
    • +11
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 118 more files in changeset.
Monday 25 Nov 2019
6:34 pm

Andrey Balan

LDEV-4861 Prevent adding the same question twice

Options
    • -0
    • +25
    ./src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
  2. … 5 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
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
    • -34
    • +66
    ./src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
    • -71
    • +5
    ./src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
    • -20
    • +20
    ./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
    • -20
    • +20
    ./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
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
    • -5
    • +4
    ./src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
  4. … 58 more files in changeset.
Thursday 07 Nov 2019
11:50 pm

Andrey Balan

LDEV-4900 Mark autosave result as final and copy results to non leaders on leader's force completion

* Finalize non-leaders on leader's finish or force-completion

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
    • -37
    • +70
    ./src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
    • -70
    • +4
    ./src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
  5. … 5 more files in changeset.