Activity lams-github/

4:33 am

Andrey Balan

More
22dd80c
changed 0 files
v4.7, v4.8

Merge branch 'master' into develop

4:33 am

Andrey Balan

More
a18dc17
changed 1 file
v4.7, v4.8

LDEV-4933 Fix exception thrown on exporting lesson Excel from Gradebook

- -2
- +3
/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
- History
- Source
- Diff
/lams_gradebook/src/.../GradebookService.java

3:42 am

Andrey Balan

More
f27fea8
changed 17 files
v4.7, v4.8

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

- -1
- +1
/lams_admin/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_admin/.../ApplicationResources.properties
- -2
- +2
/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_admin/.../ApplicationResources_en_AU.properties
- -1
- +1
/lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
/lams_admin/.../ApplicationResources_es_ES.properties
- -4
- +7
/lams_central/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources.properties
- -1
- +10
/lams_central/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_en_AU.properties
- -34
- +48
/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
/lams_common/src/.../lams/commonContext.xml
- -1
- +7
/lams_learning/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_learning/.../ApplicationResources.properties
- -1
- +1
/lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_learning/.../ApplicationResources_en_AU.properties
- -1
- +1
/lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
/lams_learning/.../ApplicationResources_es_ES.properties
- -19
- +24
/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
- History
- Source
- Diff
/lams_tool_assessment/.../assessmentApplicationContext.xml
- -12
- +20
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
- History
- Source
- Diff
/lams_tool_lamc/.../mcApplicationContext.xml
- -10
- +13
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
- History
- Source
- Diff
/lams_tool_laqa/.../qaApplicationContext.xml
- -6
- +7
/lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
- History
- Source
- Diff
/lams_tool_laqa/.../CombinedAnswersContent.jsp
- -1
- +1
/lams_tool_laqa/web/learning/LearnerRep.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../LearnerRep.jsp
- -6
- +5
/lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
- History
- Source
- Diff
/lams_tool_laqa/.../SequentialAnswersContent.jsp
- -21
- +22
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
- History
- Source
- Diff
/lams_tool_scratchie/.../scratchieApplicationContext.xml
- -4
- +7
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
- History
- Source
- Diff
/lams_tool_scratchie/.../LearningWebsocketServer.java

11:01 pm

Marcin Cieslak

More
24f0886
changed 10 files
v4.7, v4.8

Revert "LDEV-4932 Initial integration of CSRF Guard"

This reverts commit c5a709e4cb42d0729ad3fbd814714fb27dd844df.

It should have been in a separate branch.

- -8
- +0
/lams_build/build.xml
- History
- Source
- Diff
/lams_build/build.xml
- -7
- +0
/lams_build/build_base.xml
- History
- Source
- Diff
/lams_build/build_base.xml
- -1
- +0
/lams_build/conf/j2ee/jboss-deployment-structure.xml
- History
- Source
- Diff
/lams_build/.../jboss-deployment-structure.xml
- -34
- +0
/lams_build/lib/csrfguard/csrf.module.xml
- History
- Source
- Diff
/lams_build/lib/csrfguard/csrf.module.xml
- binary
/lams_build/lib/csrfguard/csrfguard-3.1.0-2019.12.19.jar
- History
- Source
- Diff
/lams_build/.../csrfguard-3.1.0-2019.12.19.jar
- -7
- +0
/lams_central/build.xml
- History
- Source
- Diff
/lams_central/build.xml
- -3
- +0
/lams_central/conf/security/Owasp.CsrfGuard.properties
- History
- Source
- Diff
/lams_central/.../Owasp.CsrfGuard.properties
- -70
- +0
/lams_central/web/WEB-INF/tlds/security/csrfguard.tld
- History
- Source
- Diff
/lams_central/web/.../security/csrfguard.tld
- -33
- +1
/lams_central/web/WEB-INF/web.xml
- History
- Source
- Diff
/lams_central/web/WEB-INF/web.xml
- -3
- +1
/lams_central/web/profile/editprofile.jsp
- History
- Source
- Diff
/lams_central/web/profile/editprofile.jsp

11:00 pm

Marcin Cieslak

More
c5a709e
changed 10 files
v4.7, v4.8

LDEV-4932 Initial integration of CSRF Guard

Add library and configuration file. Only Edit Profile form has a token

injected into form. Other POSTed forms will be stopped by the Guard,

with an error logged.

- -0
- +8
/lams_build/build.xml
- History
- Source
- Diff
/lams_build/build.xml
- -0
- +7
/lams_build/build_base.xml
- History
- Source
- Diff
/lams_build/build_base.xml
- -0
- +1
/lams_build/conf/j2ee/jboss-deployment-structure.xml
- History
- Source
- Diff
/lams_build/.../jboss-deployment-structure.xml
- -0
- +34
/lams_build/lib/csrfguard/csrf.module.xml
- History
- Source
/lams_build/lib/csrfguard/csrf.module.xml
- binary
/lams_build/lib/csrfguard/csrfguard-3.1.0-2019.12.19.jar
- History
- Source
/lams_build/lib/.../csrfguard-3.1.0-2019.12.19.jar
- -0
- +7
/lams_central/build.xml
- History
- Source
- Diff
/lams_central/build.xml
- -0
- +3
/lams_central/conf/security/Owasp.CsrfGuard.properties
- History
- Source
/lams_central/conf/.../Owasp.CsrfGuard.properties
- -0
- +70
/lams_central/web/WEB-INF/tlds/security/csrfguard.tld
- History
- Source
/lams_central/web/.../security/csrfguard.tld
- -1
- +33
/lams_central/web/WEB-INF/web.xml
- History
- Source
- Diff
/lams_central/web/WEB-INF/web.xml
- -1
- +3
/lams_central/web/profile/editprofile.jsp
- History
- Source
- Diff
/lams_central/web/profile/editprofile.jsp

11:00 pm

Marcin Cieslak

More
3cdcc42
changed 10 files
v4.7, v4.8

LDEV-4932 Initial integration of CSRF Guard

Add library and configuration file. Only Edit Profile form has a token

injected into form. Other POSTed forms will be stopped by the Guard,

with an error logged.

- -0
- +8
/lams_build/build.xml
- History
- Source
- Diff
/lams_build/build.xml
- -0
- +7
/lams_build/build_base.xml
- History
- Source
- Diff
/lams_build/build_base.xml
- -0
- +1
/lams_build/conf/j2ee/jboss-deployment-structure.xml
- History
- Source
- Diff
/lams_build/.../jboss-deployment-structure.xml
- -0
- +34
/lams_build/lib/csrfguard/csrf.module.xml
- History
- Source
/lams_build/lib/csrfguard/csrf.module.xml
- binary
/lams_build/lib/csrfguard/csrfguard-3.1.0-2019.12.19.jar
- History
- Source
/lams_build/lib/.../csrfguard-3.1.0-2019.12.19.jar
- -0
- +7
/lams_central/build.xml
- History
- Source
- Diff
/lams_central/build.xml
- -0
- +3
/lams_central/conf/security/Owasp.CsrfGuard.properties
- History
- Source
/lams_central/conf/.../Owasp.CsrfGuard.properties
- -0
- +70
/lams_central/web/WEB-INF/tlds/security/csrfguard.tld
- History
- Source
/lams_central/web/.../security/csrfguard.tld
- -1
- +33
/lams_central/web/WEB-INF/web.xml
- History
- Source
- Diff
/lams_central/web/WEB-INF/web.xml
- -1
- +3
/lams_central/web/profile/editprofile.jsp
- History
- Source
- Diff
/lams_central/web/profile/editprofile.jsp

9:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
4ae327d
changed 8 files

LDEV-4931 Adding ids to support Admin tests

- -1
- +1
/lams_admin/web/userlist.jsp
- History
- Source
- Diff
/lams_admin/web/userlist.jsp
- -1
- +1
/lams_admin/web/usersearchlist.jsp
- History
- Source
- Diff
/lams_admin/web/usersearchlist.jsp
- -1
- +1
/lams_central/web/main.jsp
- History
- Source
- Diff
/lams_central/web/main.jsp
- -1
- +1
/lams_central/web/passwordChangeContent.jsp
- History
- Source
- Diff
/lams_central/.../passwordChangeContent.jsp
- -2
- +2
/lams_central/web/passwordChangeOkContent.jsp
- History
- Source
- Diff
/lams_central/.../passwordChangeOkContent.jsp
- -2
- +2
/lams_central/web/profile/editprofile.jsp
- History
- Source
- Diff
/lams_central/web/profile/editprofile.jsp
- -1
- +1
/lams_central/web/profile/portrait.jsp
- History
- Source
- Diff
/lams_central/web/profile/portrait.jsp
- -5
- +5
/lams_central/web/profile/profile.jsp
- History
- Source
- Diff
/lams_central/web/profile/profile.jsp

6:22 am

Andrey Balan

More
d9e8a78
changed 1 file
v4.7, v4.8

Merge branch 'master' into develop

- -3
- +0
/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
/lams_learning/src/.../LearnerService.java

6:21 am

Andrey Balan

More
713a4d2
changed 43 files
v4.7, v4.8

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

* Alphabetize method names in to xApplicationContext.xmls

- -10
- +8
/lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
- History
- Source
- Diff
/lams_central/.../authoringApplicationContext.xml
- -1
- +0
/lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
- History
- Source
- Diff
/lams_central/.../IWorkspaceManagementService.java
- -6
- +5
/lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
- History
- Source
- Diff
/lams_central/.../workspaceApplicationContext.xml
- -2
- +2
/lams_common/src/java/org/lamsfoundation/lams/comments/commentsContext.xml
- History
- Source
- Diff
/lams_common/src/.../commentsContext.xml
- -35
- +49
/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
/lams_common/src/.../lams/commonContext.xml
- -4
- +6
/lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
- History
- Source
- Diff
/lams_common/src/.../integrationContext.xml
- -1
- +0
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java
- History
- Source
- Diff
/lams_common/.../IExportToolContentService.java
- -1
- +0
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignValidator.java
- History
- Source
- Diff
/lams_common/.../LearningDesignValidator.java
- -2
- +0
/lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java
- History
- Source
- Diff
/lams_common/.../ICoreNotebookService.java
- -11
- +14
/lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
- History
- Source
- Diff
/lams_common/.../toolApplicationContext.xml
- -0
- +2
/lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
- History
- Source
- Diff
/lams_common/src/.../ldapContext.xml
- -1
- +0
/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/ILdapService.java
- History
- Source
- Diff
/lams_common/src/.../ILdapService.java
- -13
- +12
/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml
- History
- Source
- Diff
/lams_contentrepository/.../applicationContext.xml
- -4
- +4
/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
- History
- Source
- Diff
/lams_gradebook/.../gradebookApplicationContext.xml
- -14
- +15
/lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
- History
- Source
- Diff
/lams_learning/.../learningApplicationContext.xml
… 28 more files in changeset.

6:18 am

Andrey Balan

More
0c4dd96
changed 4 files
v4.7, v4.8

LDEV-4930 Avoid displaying excessive user parameters on edit profile jsp

- -2
- +0
/lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java
- History
- Source
- Diff
/lams_central/src/.../ProfileController.java
- -13
- +1
/lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java
- History
- Source
- Diff
/lams_central/.../ProfileSaveController.java
- -23
- +1
/lams_central/src/java/org/lamsfoundation/lams/web/UserForm.java
- History
- Source
- Diff
/lams_central/src/java/.../web/UserForm.java
- -20
- +6
/lams_central/web/profile/editprofile.jsp
- History
- Source
- Diff
/lams_central/web/profile/editprofile.jsp

6:41 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
de2950a
changed 2 files

LDEV-4911 Added ids to support automated testing

- -1
- +1
/lams_learning/web/gate/gateDescription.jsp
- History
- Source
- Diff
/lams_learning/web/.../gateDescription.jsp
- -2
- +2
/lams_monitoring/web/gate/gateInfo.jsp
- History
- Source
- Diff
/lams_monitoring/web/gate/gateInfo.jsp

2:41 am

Andrey Balan

More
d97718e
changed 1 file
v4.7, v4.8

LDEV-4929 Make calls to addExtUserToCourseAndLesson transactional

- -0
- +1
/lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
- History
- Source
- Diff
/lams_common/src/.../integrationContext.xml

8:37 pm

Marcin Cieslak

More
6f0db40
changed 2 files
v4.7, v4.8

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

- -2
- +3
/lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
- History
- Source
- Diff
/lams_central/.../TBLTemplateController.java
- -1
- +12
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McService.java

2:45 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
d51512d
changed 2 files

Merge branch 'master' into LDEV-4886

- -0
- +19
/lams_central/web/includes/javascript/main.js
- History
- Source
- Diff
/lams_central/web/.../javascript/main.js
- -13
- +20
/lams_monitoring/web/includes/javascript/monitorLesson.js
- History
- Source
- Diff
/lams_monitoring/web/.../monitorLesson.js

10:55 am

Andrey Balan

More
e4ab751
changed 10 files
v4.7, v4.8

LDEV-4928 Update monitoring, TBL monitoring and Excel export to fully support VSA question type

- -0
- +11
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
- History
- Source
- Diff
/lams_tool_scratchie/.../GroupSummary.java
- -0
- +9
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/ScratchieItemDTO.java
- History
- Source
- Diff
/lams_tool_scratchie/.../ScratchieItemDTO.java
- -1
- +14
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
- History
- Source
- Diff
/lams_tool_scratchie/.../IScratchieService.java
- -67
- +112
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
/lams_tool_scratchie/.../ScratchieServiceImpl.java
- -30
- +13
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
- History
- Source
- Diff
/lams_tool_scratchie/.../MonitoringController.java
- -56
- +43
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
- History
- Source
- Diff
/lams_tool_scratchie/.../TblMonitorController.java
- -4
- +1
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/PopulateMarksServlet.java
- History
- Source
- Diff
/lams_tool_scratchie/.../PopulateMarksServlet.java
- -5
- +5
/lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp
- History
- Source
- Diff
/lams_tool_scratchie/web/.../itemSummary.jsp
- -6
- +14
/lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp
- History
- Source
- Diff
/lams_tool_scratchie/web/.../tra.jsp
- -11
- +18
/lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp
- History
- Source
- Diff
/lams_tool_scratchie/.../traStudentChoices.jsp

10:07 pm

Marcin Cieslak

More
e70d228
changed 2 files
v4.7, v4.8

LDEV-4921 Fix ordering for burning question in Scratchie learner

- -1
- +1
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
- History
- Source
- Diff
/lams_tool_scratchie/.../LearningController.java
- -4
- +6
/lams_tool_scratchie/web/pages/learning/results.jsp
- History
- Source
- Diff
/lams_tool_scratchie/web/.../results.jsp

9:24 pm

Marcin Cieslak

More
3e7a435
changed 1 file
v4.7, v4.8

LDEV-4921 Properly detect General Burning Question in TBL monitor

- -1
- +1
/lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
- History
- Source
- Diff
/lams_tool_scratchie/.../burningQuestions.jsp

1:54 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
a8d3dcd
changed 0 files
v4.7, v4.8

LDEV-4922 Email results are generated for comment only rating activity

1:53 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
d1a2e34
changed 0 files
v4.7, v4.8

LDEV-4922 Email results are generated for comment only rating activity

1:53 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
d2a6e36
changed 1 file
v4.7, v4.8

LDEV-4922 Email results are generated for comment only rating activity

- -25
- +27
/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java
- History
- Source
- Diff
/lams_tool_preview/.../EmailAnalysisBuilder.java

12:26 am

Andrey Balan

More
3cb5f91
changed 18 files
v4.7, v4.8

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