lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 19 Dec 2019
11:00 pm

Marcin Cieslak

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.

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

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4931 Adding ids to support Admin tests

Options
    • -1
    • +1
    /lams_admin/web/userlist.jsp
    • -1
    • +1
    /lams_admin/web/usersearchlist.jsp
    • -1
    • +1
    /lams_central/web/main.jsp
    • -1
    • +1
    /lams_central/web/passwordChangeContent.jsp
    • -2
    • +2
    /lams_central/web/passwordChangeOkContent.jsp
    • -2
    • +2
    /lams_central/web/profile/editprofile.jsp
    • -1
    • +1
    /lams_central/web/profile/portrait.jsp
    • -5
    • +5
    /lams_central/web/profile/profile.jsp
6:22 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -3
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
6:21 am

Andrey Balan

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

* Alphabetize method names in to xApplicationContext.xmls

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

Andrey Balan

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

Options
    • -2
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java
    • -13
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java
    • -23
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/UserForm.java
    • -20
    • +6
    /lams_central/web/profile/editprofile.jsp
Wednesday 18 Dec 2019
6:41 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Added ids to support automated testing

Options
    • -1
    • +1
    /lams_learning/web/gate/gateDescription.jsp
    • -2
    • +2
    /lams_monitoring/web/gate/gateInfo.jsp
Tuesday 17 Dec 2019
2:41 am

Andrey Balan

LDEV-4929 Make calls to addExtUserToCourseAndLesson transactional

Options
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
Monday 16 Dec 2019
8:37 pm

Marcin Cieslak

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

Options
    • -2
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -1
    • +12
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
2:45 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into LDEV-4886

Options
    • -0
    • +19
    /lams_central/web/includes/javascript/main.js
    • -13
    • +20
    /lams_monitoring/web/includes/javascript/monitorLesson.js
Saturday 14 Dec 2019
10:55 am

Andrey Balan

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

Options
    • -0
    • +11
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -0
    • +9
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/ScratchieItemDTO.java
    • -1
    • +14
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -67
    • +112
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -30
    • +13
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -56
    • +43
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -4
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/PopulateMarksServlet.java
    • -5
    • +5
    /lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp
    • -6
    • +14
    /lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp
    • -11
    • +18
    /lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp
Friday 13 Dec 2019
10:07 pm

Marcin Cieslak

LDEV-4921 Fix ordering for burning question in Scratchie learner

Options
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -4
    • +6
    /lams_tool_scratchie/web/pages/learning/results.jsp
9:24 pm

Marcin Cieslak

LDEV-4921 Properly detect General Burning Question in TBL monitor

Options
    • -1
    • +1
    /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
Thursday 12 Dec 2019
1:54 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
1:53 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
1:53 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -25
    • +27
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java
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
    • -2
    • +3
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -3
    • +19
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -25
    • +39
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -4
    • +7
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +6
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -8
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
    • -2
    • +3
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +16
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +5
    /lams_tool_laqa/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_laqa/web/learning/LearnerRep.jsp
  16. … 3 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
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
4:39 pm

Marcin Cieslak

LDEV-4802 Try to identify and fix a NPE in Scratchie websockets

Options
    • -5
    • +8
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
6:11 am

Andrey Balan

LDEV-4880 Correctly check whether variable is undefined

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/jquery.jqGrid.confidence-level-formattter.js
5:59 am

Andrey Balan

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

Options
    • -1
    • +5
    /lams_tool_laqa/web/learning/LearnerRep.jsp
5:56 am

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

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

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

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

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

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

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

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

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

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

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

Andrey Balan

Merge branch 'LDEV-4927' into develop

Options
5:05 am

Andrey Balan

LDEV-4927 Add padding to confidence widget

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

Andrey Balan

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

* Some minor tweaks in monitor pages

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

Marcin Cieslak

LDEV-4921 Hide question titles in TBL monitoring IRA

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

Marcin Cieslak

LDEV-4921 Hide question titles in TBL monitoring burning questions

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

Marcin Cieslak

LDEV-4921 Hide question titles in Scratchie monitoring burning questions

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

Marcin Cieslak

LDEV-4921 Hide question titles in Scratchie burning questions

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

Andrey Balan

LDEV-4927 Stop using "RevisitedLearnerRep.jsp" page

* Remove redundant form fields

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

Ernie Ghiglione

LDEV-4769 updating labels

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