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
Monday 18 Nov 2019
4:23 pm

Marcin Cieslak

LDEV-4902 Fix Login As feature when SAML is in use.

Does not seem to work well on Chrome.

Options
    • -2
    • +3
    /lams_central/web/login.jsp
1:08 pm

Marcin Cieslak

LDEV-4904 Fix possible exception when converting SQL result into Java

Options
    • -6
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
Saturday 16 Nov 2019
6:09 am

Andrey Balan

LDEV-4903 Fixed importing LD using a blank DB

Options
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -0
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
3:49 am

Andrey Balan

LDEV-4875 Fix scratching of MCQ questions

Options
    • -2
    • +6
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
    • -4
    • +3
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
Friday 15 Nov 2019
5:18 pm

Marcin Cieslak

LDEV-4900 Put websocket commands in a separate transaction

Otherwise command websocket server does not see them until main

transaction finishes.

Options
    • -0
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
5:17 pm

Marcin Cieslak

LDEV-4900 Fix websocket server run frequency

Options
    • -2
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
4:10 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into LDEV-4900

Options
    • -26
    • +44
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Thursday 14 Nov 2019
10:28 pm

Andrey Balan

LDEV-4897 Update Scratchie to use new Excel exporting methods

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

Marcin Cieslak

LDEV-4900 Make other tools react to autosave command

Options
    • -4
    • +4
    /lams_tool_lamc/web/learning/AnswersContent.jsp
    • -20
    • +20
    /lams_tool_laqa/web/learning/AnswersContent.jsp
    • -17
    • +16
    /lams_tool_scratchie/web/pages/learning/learning.jsp
9:34 pm

Andrey Balan

LDEV-4745 Set general burning question's uid to 0

Options
    • -2
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -11
    • +12
    /lams_tool_scratchie/web/pages/learning/results.jsp
9:30 pm

Andrey Balan

LDEV-4745 Handle situation when confidenceLevelActivity is set in Scratchie, but then the actual confidenceLevelActivity is later removed

Options
    • -1
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
9:28 pm

Marcin Cieslak

LDEV-4900 Distribute modified Page tag to all tools

Options
    • -1
    • +11
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -1
    • +11
    /lams_central/web/WEB-INF/tags/Page.tag
    • -1
    • +11
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -1
    • +11
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -1
    • +11
    /lams_monitoring/web/WEB-INF/tags/Page.tag
    • -1
    • +11
    /lams_tool_chat/web/WEB-INF/tags/Page.tag
    • -1
    • +11
    /lams_tool_daco/web/WEB-INF/tags/Page.tag
    • -1
    • +11
    /lams_tool_doku/web/WEB-INF/tags/Page.tag
    • -1
    • +11
    /lams_tool_forum/web/WEB-INF/tags/Page.tag
    • -1
    • +11
    /lams_tool_gmap/web/WEB-INF/tags/Page.tag
    • -1
    • +11
    /lams_tool_images/web/WEB-INF/tags/Page.tag
    • -1
    • +11
    /lams_tool_imscc/web/WEB-INF/tags/Page.tag
    • -1
    • +11
    /lams_tool_lamc/web/WEB-INF/tags/Page.tag
    • -1
    • +11
    /lams_tool_laqa/web/WEB-INF/tags/Page.tag
    • -1
    • +11
    /lams_tool_larsrc/web/WEB-INF/tags/Page.tag
  16. … 16 more files in changeset.
7:10 pm

Marcin Cieslak

LDEV-4900 Temporary fix for deadlock on tool session creation

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
5:30 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -26
    • +44
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
5:28 am

Andrey Balan

LDEV-4894 Fix opening group details from monitor's Learners tab

Options
    • -26
    • +44
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
Wednesday 13 Nov 2019
4:00 am

Marcin Cieslak

LDEV-4900 Run autosave command asynchronously after all

Synchronous approach would work only on LAMS installation with a single

application server. For multi-server environment we need to wait for the

proper server to pick up the command from DB.

Options
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -58
    • +30
    /lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -7
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -12
    • +6
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
3:32 am

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
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -78
    • +79
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -1
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -41
    • +72
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
    • -56
    • +25
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -11
    • +0
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java
    • -5
    • +13
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerFullService.java
    • -50
    • +87
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -5
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java
    • -2
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayActivityController.java
    • -3
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
  16. … 46 more files in changeset.
Tuesday 12 Nov 2019
12:06 am

Marcin Cieslak

LDEV-4900 Trigger autosave when force completing Assessment activity

Options
    • -5
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -27
    • +54
    /lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -7
    • +13
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -5
    • +29
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +11
    /lams_tool_assessment/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/learning.jsp
Monday 11 Nov 2019
10:54 pm

Marcin Cieslak

LDEV-4900 Make Assessment autosave a recognisable function

Options
    • -24
    • +23
    /lams_tool_assessment/web/pages/learning/learning.jsp
Saturday 09 Nov 2019
6:00 am

Andrey Balan

LDEV-4900 Fix issues

Options
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -2
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
Friday 08 Nov 2019
11:29 pm

Marcin Cieslak

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_central/web/main.jsp

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

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

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

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

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

lams_tool_lamc/web/authoring/itemlist.jsp

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

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

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

lams_tool_scratchie/web/pages/authoring/start.jsp

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -655
    • +660
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -19
    • +24
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -16
    • +23
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -339
    • +336
    /lams_central/web/main.jsp
    • -0
    • +4
    /lams_central/web/questions/questionChoice.jsp
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionExporter.java
    • -305
    • +307
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
    • -345
    • +285
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -318
    • +297
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -2
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -293
    • +212
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  16. … 13 more files in changeset.
11:29 pm

Marcin Cieslak

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_central/web/main.jsp

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

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

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

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

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

lams_tool_lamc/web/authoring/itemlist.jsp

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

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

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

lams_tool_scratchie/web/pages/authoring/start.jsp

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
4:24 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Conflicts:

lams_central/web/includes/javascript/authoring/authoringActivity.js

Options
    • -1
    • +1
    /lams_central/web/authoring/authoring.jsp
    • -2
    • +8
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
6:50 am

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
    • -46
    • +77
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -20
    • +33
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -11
    • +19
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -0
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
    • -2
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
    • -37
    • +70
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
    • -70
    • +4
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
    • -24
    • +48
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -44
    • +40
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
3:11 am

Marcin Cieslak

LDEV-4647 Convert escaped %20 characters back to spaces

Options
    • -8
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionExporter.java
Wednesday 06 Nov 2019
9:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4887 Adding id, classes to make automated testing faster

Options
    • -1
    • +1
    /lams_central/web/authoring/authoring.jsp
    • -2
    • +2
    /lams_central/web/authoring/template/createresult.jsp
    • -1
    • +1
    /lams_central/web/authoring/template/list.jsp
    • -4
    • +4
    /lams_central/web/authoring/template/tbl/appex.jsp
    • -1
    • +1
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
    • -1
    • +1
    /lams_learning/web/lessonComplete.jsp
    • -2
    • +2
    /lams_tool_lamc/web/authoring/itemlist.jsp
1:07 am

Andrey Balan

Merge branch 'master' into develop

Options
1:06 am

Andrey Balan

LDEV-4897 Handle empty "extraPoint" parameter

Options
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Tuesday 05 Nov 2019
11:25 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

Options
    • -7
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
    • -18
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
6:53 pm

Marcin Cieslak

Merge branch 'LDEV-4901'

Options