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 30 Jan 2020
6:01 am

Andrey Balan

Merge branch 'LDEV-4959' into v4.0

Options
6:00 am

Andrey Balan

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

Options
    • -0
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql
    • -3
    • +4
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
Wednesday 29 Jan 2020
6:24 am

Andrey Balan

LDEV-4953 Add missing <%@ page isErrorPage="true"%>

Options
    • -0
    • +1
    /lams_monitoring/web/error.jsp
6:07 am

Andrey Balan

LDEV-4951 Migrate MCQ tool to Assessment

Options
    • -0
    • +1
    /lams_monitoring/web/error.jsp
    • -0
    • +12
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +152
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200120.sql
    • -8
    • +17
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java
    • -0
    • +170
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/UserMarkDTO.java
    • -0
    • +35
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -3
    • +388
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +52
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -0
    • +11
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
Tuesday 28 Jan 2020
7:19 pm

Marcin Cieslak

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

Options
7:17 pm

Marcin Cieslak

Merge branch 'LDEV-4958' into v4.0

Options
7:17 pm

Marcin Cieslak

LDEV-4958 Set content folder ID when importing QTI questions to QB

Options
    • -0
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
2:39 pm

Marcin Cieslak

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

Options
2:38 pm

Marcin Cieslak

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

Options
    • -0
    • +2
    /lams_admin/conf/language/lams/ApplicationResources.properties
2:36 pm

Marcin Cieslak

Merge branch 'LDEV-4957'

Options
2:35 pm

Marcin Cieslak

LDEV-4957 Confirm before deleting integrated server or LTI consumer

Options
    • -1
    • +2
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +6
    /lams_admin/web/integration/ltiConsumerList.jsp
    • -1
    • +6
    /lams_admin/web/integration/serverlist.jsp
8:48 am

Andrey Balan

LDEV-4956 Update "user_id" parameter if extServer.getUseAlternativeUseridParameterName() setting is ON

Options
    • -2
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
Friday 24 Jan 2020
2:42 am

Andrey Balan

Merge branch 'master' into v4.0

Options
    • -0
    • +5
    /lams_central/conf/security/Owasp.CsrfGuard.properties
2:26 am

Andrey Balan

LDEV-4932 Add CSRF to LKC monitoring

Options
    • -0
    • +5
    /lams_central/conf/security/Owasp.CsrfGuard.properties
Thursday 23 Jan 2020
11:53 pm

Andrey Balan

Merge branch 'master' into v4.0

Options
11:38 pm

Andrey Balan

LDEV-4954 Start now lesson in monitor using POST

Options
    • -1
    • +2
    /lams_monitoring/web/includes/javascript/monitorLesson.js
11:23 pm

Andrey Balan

LDEV-4955 Properly disable lesson on schedule

Options
    • -3
    • +8
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -4
    • +0
    /lams_monitoring/web/monitor.jsp
6:50 am

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_central/web/common/taglibs.jsp

Options
    • -0
    • +5
    /lams_central/web/WEB-INF/web.xml
    • -1
    • +1
    /lams_central/web/common/taglibs.jsp
6:42 am

Andrey Balan

Merge branch 'LDEV-4953'

Options
6:40 am

Andrey Balan

LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

Options
    • -1
    • +0
    /lams_admin/web/403.jsp
    • -1
    • +0
    /lams_admin/web/404.jsp
    • -0
    • +5
    /lams_admin/web/WEB-INF/web.xml
    • -2
    • +1
    /lams_admin/web/error.jsp
    • -1
    • +0
    /lams_admin/web/login.jsp
    • -0
    • +5
    /lams_central/web/WEB-INF/web.xml
    • -1
    • +0
    /lams_central/web/ckeditor/plugins/jlatexmath/buttons.jsp
    • -1
    • +1
    /lams_central/web/ckeditor/plugins/jlatexmath/jlatexmath.jsp
    • -1
    • +0
    /lams_central/web/common/taglibs.jsp
    • -1
    • +1
    /lams_central/web/error.jsp
    • -1
    • +5
    /lams_gradebook/web/WEB-INF/web.xml
    • -1
    • +0
    /lams_gradebook/web/common/taglibs.jsp
    • -1
    • +0
    /lams_learning/web/403.jsp
    • -1
    • +0
    /lams_learning/web/404.jsp
    • -0
    • +6
    /lams_learning/web/WEB-INF/web.xml
  16. … 158 more files in changeset.
Wednesday 22 Jan 2020
9:39 pm

Marcin Cieslak

Merge branch 'LDEV-4950' into v4.1

Options
9:38 pm

Marcin Cieslak

LDEV-4950 Drag&drop item sorting in Scratchie authoring

Also in Scratchie and Assessment update visible question numbering on

sort.

Options
    • -2
    • +4
    /lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
    • -10
    • +14
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -49
    • +16
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -26
    • +1
    /lams_tool_scratchie/web/pages/authoring/basic.jsp
    • -14
    • +50
    /lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
9:38 pm

Marcin Cieslak

LDEV-4950 Drag&drop item sorting in Scratchie authoring

Also in Scratchie and Assessment update visible question numbering on

sort.

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

Options
    • -2
    • +4
    /lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
    • -0
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -49
    • +16
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -26
    • +1
    /lams_tool_scratchie/web/pages/authoring/basic.jsp
    • -2
    • +47
    /lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
6:19 pm

Marcin Cieslak

Merge branch 'LDEV-4946' into v4.0

Options
6:19 pm

Marcin Cieslak

LDEV-4946 Make LTI add lesson screen work with new LD tree

Options
    • -68
    • +40
    /lams_central/web/lti/addLesson.jsp
4:20 pm

Marcin Cieslak

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

Conflicts:

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101_updateTo30.sql

Options
    • -404
    • +404
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101_updateTo30.sql
4:19 pm

Marcin Cieslak

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

Options
    • -36
    • +36
    /lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
Tuesday 21 Jan 2020
4:23 am

Andrey Balan

LDEV-4948 Prevent adding enctype="multipart/form-data" to forms

Options
    • -4
    • +4
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -1
    • +0
    /lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
    • -1
    • +0
    /lams_tool_lamc/web/authoring/BasicContent.jsp
    • -2
    • +2
    /lams_tool_laqa/web/learning/AnswersContent.jsp
    • -4
    • +4
    /lams_tool_scratchie/web/pages/learning/learning.jsp
Monday 20 Jan 2020
2:34 pm

Marcin Cieslak

LDEV-4846 Set QB question content folder when creating via TBL template

Options
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
    • -0
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
2:31 pm

Marcin Cieslak

Merge branch 'LDEV-4947' into v4.0

Options