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 10 Oct 2019
5:35 am

Andrey Balan

Merge branch 'LDEV-4875' into LDEV-4745

Options
5:32 am

Andrey Balan

LDEV-4875 Fixes for VSA feature

Options
    • -2
    • +11
    /lams_central/web/qb/stats.jsp
    • -1
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
    • -14
    • +14
    /lams_tool_assessment/web/pages/authoring/authoring.jsp
    • -18
    • +15
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -18
    • +27
    /lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
    • -3
    • +3
    /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
    • -13
    • +42
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/OptionDTO.java
    • -4
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -0
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -49
    • +54
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -7
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -9
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
    • -5
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -5
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -16
    • +12
    /lams_tool_scratchie/web/pages/authoring/parts/addVsa.jsp
  16. … 8 more files in changeset.
Wednesday 09 Oct 2019
4:19 pm

dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump httpclient from 4.2.2 to 4.3.6 in /3rdParty_sources/basiclti-util

Bumps httpclient from 4.2.2 to 4.3.6.

Signed-off-by: dependabot[bot] <support@github.com>

Options
    • -1
    • +1
    /3rdParty_sources/basiclti-util/pom.xml
4:18 pm

Andrey Balan

Merge branch 'master' into develop

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
4:17 pm

Andrey Balan

Merge branch 'LDEV-4876'

Options
4:16 pm

Andrey Balan

LDEV-4876 Ability for LTI servers to get userId using alternative request parameter name

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +10
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java
    • -1
    • +6
    /lams_admin/web/integration/ltiConsumer.jsp
    • -4
    • +9
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20191009.sql
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java
5:39 am

Andrey Balan

Merge branch 'LDEV-4875' into LDEV-4745

Options
5:35 am

Andrey Balan

LDEV-4875 Portrait tag to use double quotes for src parameter

Options
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
5:27 am

Andrey Balan

LDEV-4875 Recalculate all assessments and scratchies after answer allocation into group

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java
    • -6
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -0
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonScratchieService.java
    • -0
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
    • -1
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
    • -1
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -0
    • +13
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -49
    • +104
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +8
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -0
    • +14
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -0
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -12
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
    • -2
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -17
    • +25
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -3
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
5:26 am

Andrey Balan

LDEV-4875 Item summary page to display options correctly

Options
    • -20
    • +21
    /lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp
2:12 am

Marcin Cieslak

LKC-221 Rearrange and regenerate LD SVG after activities were modified

Options
    • -3
    • +7
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
Saturday 05 Oct 2019
6:04 am

Andrey Balan

Merge branch 'LDEV-4875' into LDEV-4745

Options
6:02 am

Andrey Balan

LDEV-4875 Add VSA question type to Assessment and Scratchie

Options
    • -2
    • +4
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -9
    • +32
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -2
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -6
    • +6
    /lams_central/web/css/qb-question.scss
    • -24
    • +26
    /lams_central/web/includes/javascript/qb-option.js
    • -0
    • +231
    /lams_central/web/qb/authoring/addVsa.jsp
    • -207
    • +0
    /lams_central/web/qb/authoring/addshortanswer.jsp
    • -3
    • +3
    /lams_central/web/qb/authoring/optionlist.jsp
    • -19
    • +0
    /lams_central/web/qb/authoring/shortansweroption.jsp
    • -0
    • +23
    /lams_central/web/qb/authoring/vsaOption.jsp
    • -4
    • +14
    /lams_central/web/qb/qbQuestionDetails.jsp
    • -1
    • +2
    /lams_central/web/qb/search.jsp
    • -0
    • +80
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/VsaAnswerDTO.java
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190913.sql
  16. … 61 more files in changeset.
Monday 30 Sep 2019
9:07 pm

Marcin Cieslak

LKC-221 Fill Scratchie and Assessment with WA questions

Options
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/IQbToolService.java
    • -0
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -3
    • +44
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +7
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -1
    • +30
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
1:28 pm

Marcin Cieslak

LKC-221 Fill MCQ with RAT questions.

Options
    • -0
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/IQbToolService.java
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -1
    • +21
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
Thursday 26 Sep 2019
5:44 pm

Marcin Cieslak

LKC-215 Display WA logs on QB stats page

Options
    • -1
    • +19
    /lams_central/conf/language/lams/ApplicationResources.properties
2:55 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-4745' into v4.0

Options
Monday 23 Sep 2019
8:14 pm

Andrey Balan

LDEV-4872 McSession to save users as Set instead of List

Options
    • -12
    • +14
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McSession.java
    • -3
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
8:14 pm

Andrey Balan

LDEV-4872 McSession to save users as Set instead of List

Options
    • -12
    • +14
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McSession.java
    • -3
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
Saturday 21 Sep 2019
10:57 pm

Marcin Cieslak

LDEV-4871 Fix query string building when requesting a print page

Options
    • -7
    • +14
    /lams_central/web/includes/javascript/orgGroup.js
Friday 13 Sep 2019
10:01 pm

Marcin Cieslak

LKC-215 Modify question review flow

Options
    • -0
    • +2
    /lams_central/web/qb/stats.jsp
Thursday 12 Sep 2019
6:44 pm

Andrey Balan

Merge branch 'master' into develop

Options
6:43 pm

Andrey Balan

LDEV-4869 Show error message in case lesson does not exist

Options
    • -0
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
6:42 pm

Andrey Balan

LDEV-4869 Prevent authentication of LTI learners with blank lessonId

Also show relevant warning message.

Options
    • -9
    • +17
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
Wednesday 11 Sep 2019
5:43 pm

Andrey Balan

Merge branch 'master' into develop

Options
5:42 pm

Andrey Balan

Merge branch 'LDEV-4869'

Options
5:41 pm

Andrey Balan

LDEV-4869 Add urn:lti:instrole:ims/lis/Instructor to LTI default instructor roles

Options
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java
5:40 pm

Andrey Balan

LDEV-4869 Add default lesson settings for LTI tool consumers

* Also move all integrations jsps to /integration/ folder

Options
    • -8
    • +12
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
    • -0
    • +38
    /lams_admin/web/integration/extLessonForm.jsp
    • -0
    • +126
    /lams_admin/web/integration/ltiConsumer.jsp
    • -0
    • +88
    /lams_admin/web/integration/ltiConsumerList.jsp
    • -0
    • +72
    /lams_admin/web/integration/serverlist.jsp
    • -0
    • +136
    /lams_admin/web/integration/servermaintain.jsp
    • -112
    • +0
    /lams_admin/web/lti/ltiConsumer.jsp
    • -88
    • +0
    /lams_admin/web/lti/ltiConsumerList.jsp
    • -72
    • +0
    /lams_admin/web/serverlist.jsp
    • -172
    • +0
    /lams_admin/web/servermaintain.jsp
5:39 pm

Andrey Balan

LDEV-4869 Aggregate ServerListController, ServerMaintainController and ServerSaveController into a single ExtServerManagementController

Options
    • -0
    • +186
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java
    • -54
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerListController.java
    • -91
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java
    • -138
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
5:37 pm

Andrey Balan

LDEV-4869 Create common form for ExtServerForm and LtiConsumerForm

Options
    • -0
    • +171
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerCommonForm.java
    • -162
    • +5
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java
    • -91
    • +6
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java