lams-github / lams_common / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 32
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 30 Jan 2020
6:00 am

Andrey Balan

LDEV-4959 Prevent leader and non-leader from creating two GradebookUserLessons at the same time

Options
    • -0
    • +22
    ./lamsfoundation/lams/dbupdates/patch20200129.sql
  2. … 1 more file in changeset.
Wednesday 22 Jan 2020
4:19 pm

Marcin Cieslak

LDEV-4914 Fall back to default settings values when creating a lesson

Options
    • -36
    • +36
    ./lamsfoundation/lams/lesson/Lesson.java
Monday 20 Jan 2020
4:12 am

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch0013_updateFrom21.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190415.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190429.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190806.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20191009.sql
  8. … 70 more files in changeset.
Sunday 19 Jan 2020
3:25 pm

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch0013_updateFrom21.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190119.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190126.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190201.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190226.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190313.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190415.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190429.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190520.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190723.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190724.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190725.sql
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190806.sql
  16. … 87 more files in changeset.
Thursday 16 Jan 2020
4:24 pm

Marcin Cieslak

LDEV-4846 Prevent creation of QB questions with missing content folder

Options
    • -0
    • +12
    ./lamsfoundation/lams/dbupdates/patch20200116.sql
    • -0
    • +4
    ./lamsfoundation/lams/qb/service/QbService.java
5:56 am

Andrey Balan

LDEV-4943 Don't log error message on learner accessing LTI lesson

(cherry picked from commit 9f6b6a7487f9b5cbf283bf95361e3778e93fde95)

Options
    • -0
    • +5
    ./lamsfoundation/lams/security/ISecurityService.java
    • -2
    • +5
    ./lamsfoundation/lams/security/SecurityService.java
  3. … 1 more file in changeset.
5:56 am

Andrey Balan

LDEV-4943 Don't log error message on learner accessing LTI lesson

Options
    • -0
    • +5
    ./lamsfoundation/lams/security/ISecurityService.java
    • -2
    • +5
    ./lamsfoundation/lams/security/SecurityService.java
  3. … 1 more file in changeset.
Tuesday 14 Jan 2020
5:43 pm

Marcin Cieslak

LDEV-4941 Prevent "stealing" a QB question

Prevent changing an existing question's collection if it is not in one

of user's own collections

Options
    • -3
    • +14
    ./lamsfoundation/lams/qb/QbUtils.java
    • -4
    • +6
    ./lamsfoundation/lams/qb/dao/IQbDAO.java
    • -5
    • +15
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    ./lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +5
    ./lamsfoundation/lams/qb/service/QbService.java
  6. … 3 more files in changeset.
Saturday 11 Jan 2020
5:33 am

Andrey Balan

LDEV-4831 Bypass 2FA if using Login-as

(cherry picked from commit 26e7a51d2a74ef045d6e056752fd60bf510f2024)

Options
    • -4
    • +7
    ./lamsfoundation/lams/integration/security/SsoHandler.java
5:33 am

Andrey Balan

LDEV-4831 Bypass 2FA if using Login-as

Options
    • -4
    • +7
    ./lamsfoundation/lams/integration/security/SsoHandler.java
Friday 10 Jan 2020
8:47 pm

Marcin Cieslak

LDEV-4746 Allow even larger output for SQL concat function

Options
    • -1
    • +1
    ./lamsfoundation/lams/dbupdates/patch20190722.sql
8:47 pm

Marcin Cieslak

LDEV-4746 Fix strip_tags SQL function when input is NULL

Options
    • -0
    • +1
    ./lamsfoundation/lams/dbupdates/patch20190721.sql
Thursday 09 Jan 2020
3:59 pm

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
    • -4
    • +4
    ./lamsfoundation/lams/util/WebUtil.java
  2. … 94 more files in changeset.
2:31 pm

Marcin Cieslak

LDEV-4649 Use correct scale field when importing learning outcomes

Options
    • -4
    • +4
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
Wednesday 08 Jan 2020
3:42 am

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

Options
    • -1
    • +2
    ./lamsfoundation/lams/integration/service/IIntegrationService.java
    • -1
    • +2
    ./lamsfoundation/lams/integration/service/IntegrationService.java
    • -4
    • +3
    ./lamsfoundation/lams/util/WebUtil.java
  4. … 48 more files in changeset.
Tuesday 07 Jan 2020
5:41 pm

Marcin Cieslak

LDEV-3119 Renormalize incorrect line endings for git to work better

Options
    • -38
    • +38
    ./lamsfoundation/lams/dbupdates/patch02040021.sql
Friday 03 Jan 2020
6:44 pm

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

# 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/web/includes/javascript/authoring/authoringGeneral.js

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

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

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

Options
    • -1
    • +6
    ./lamsfoundation/lams/util/ConfigurationKeys.java
  2. … 19 more files in changeset.
2:29 pm

Marcin Cieslak

LDEV-4743 Squash core patches updating to version 3.1

Options
    • -16
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170209.sql
    • -14
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170308.sql
    • -16
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170309.sql
    • -14
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170310.sql
    • -38
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170323.sql
    • -15
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170410.sql
    • -16
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170411.sql
    • -15
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170508.sql
    • -76
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170512.sql
    • -15
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170628.sql
    • -50
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170710.sql
    • -15
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170720.sql
    • -15
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170814.sql
    • -22
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170908.sql
    • -15
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170926.sql
  16. … 38 more files in changeset.
2:11 pm

Marcin Cieslak

Merge tag 'v3.0'

Freeze 3.0 version

Options
    • -0
    • +12
    ./lamsfoundation/lams/dbupdates/patch02030200_updateTo232.sql
1:40 pm

Marcin Cieslak

LDEV-4743 Squash core patches updating to version 3.0

Options
    • -22
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040007.sql
    • -18
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040008.sql
    • -74
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040009.sql
    • -10
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040010.sql
    • -10
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040011.sql
    • -10
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040012.sql
    • -25
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040013.sql
    • -30
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040014.sql
    • -12
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040015.sql
    • -12
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040016.sql
    • -13
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040017.sql
    • -12
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040018.sql
    • -14
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040019.sql
    • -19
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040020.sql
    • -38
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040021.sql
  16. … 64 more files in changeset.
1:20 pm

Marcin Cieslak

LDEV-4743 Squash patches updating to version 2.4

Options
    • -43
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040000.sql
    • -14
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040002.sql
    • -18
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040004.sql
    • -128
    • +0
    ./lamsfoundation/lams/dbupdates/patch02040006.sql
    • -0
    • +320
    ./lamsfoundation/lams/dbupdates/patch02040006_updateTo24.sql
1:19 pm

Marcin Cieslak

LDEV-4743 Rename patch to keep naming convention

Options
    • -12
    • +0
    ./lamsfoundation/lams/dbupdates/patch02030200_update232_version.sql
    • -0
    • +12
    ./lamsfoundation/lams/dbupdates/patch02030200_updateTo232.sql
Friday 20 Dec 2019
10:27 pm

Andrey Balan

LDEV-4933 Take care about null/100.0 case

Options
    • -2
    • +2
    ./lamsfoundation/lams/util/excel/ExcelRow.java
  2. … 2 more files in changeset.
3:42 am

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
    • -34
    • +48
    ./lamsfoundation/lams/commonContext.xml
  2. … 16 more files in changeset.
Thursday 19 Dec 2019
6:21 am

Andrey Balan

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

* Alphabetize method names in to xApplicationContext.xmls

Options
    • -2
    • +2
    ./lamsfoundation/lams/comments/commentsContext.xml
    • -35
    • +49
    ./lamsfoundation/lams/commonContext.xml
    • -4
    • +6
    ./lamsfoundation/lams/integrationContext.xml
    • -1
    • +0
    ./lamsfoundation/lams/learningdesign/service/IExportToolContentService.java
    • -1
    • +0
    ./lamsfoundation/lams/learningdesign/service/LearningDesignValidator.java
    • -2
    • +0
    ./lamsfoundation/lams/notebook/service/ICoreNotebookService.java
    • -11
    • +14
    ./lamsfoundation/lams/toolApplicationContext.xml
    • -0
    • +2
    ./lamsfoundation/lams/usermanagement/ldapContext.xml
    • -1
    • +0
    ./lamsfoundation/lams/usermanagement/service/ILdapService.java
  10. … 34 more files in changeset.
Tuesday 17 Dec 2019
2:41 am

Andrey Balan

LDEV-4929 Make calls to addExtUserToCourseAndLesson transactional

Options
    • -0
    • +1
    ./lamsfoundation/lams/integrationContext.xml
Thursday 12 Dec 2019
12:26 am

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
    • -8
    • +21
    ./lamsfoundation/lams/web/session/SessionManager.java
  2. … 17 more files in changeset.
Wednesday 11 Dec 2019
4:42 pm

Marcin Cieslak

LDEV-4293 Prevent session invalidation exceptions from propagating

It seems that WildFly distributed session management may have bugs. On

session invalidation there is an attempt to close a websocket channel,

even if it does not exist. If it happens, an user gets in an endless

loop of accessing error.jsp page, trying to get session, trying to

invalidate his previous session, getting an error etc. We should at

least prevent the user from getting a visible error and let him try to

create a new session.

Options
    • -8
    • +21
    ./lamsfoundation/lams/web/session/SessionManager.java
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
    • +3
    ./lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -335
    • +330
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
  3. … 9 more files in changeset.
Saturday 07 Dec 2019
6:07 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

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

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

Options
    • -4
    • +3
    ./lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -37
    • +32
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
  3. … 1 more file in changeset.