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 23 Jan 2020
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
2:31 pm

Marcin Cieslak

LDEV-4947 Add questions from imported LD to user private QB collection

Options
    • -7
    • +7
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -7
    • +10
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -2
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
    • -12
    • +14
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
6:50 am

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190704.sql
4:12 am

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0013_updateFrom21.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190415.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190429.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190806.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20191009.sql
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170101_updateTo30.sql
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190423.sql
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191016.sql
    • -2
    • +2
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081027_updateFrom21.sql
    • -2
    • +2
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081125_updateFrom22.sql
    • -2
    • +2
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20110416_updateFrom235.sql
    • -2
    • +2
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20170101_updateTo30.sql
  16. … 62 more files in changeset.
Sunday 19 Jan 2020
3:25 pm

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0013_updateFrom21.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190126.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190201.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190226.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190313.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190415.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190429.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190520.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190725.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190806.sql
  16. … 87 more files in changeset.
Friday 17 Jan 2020
6:04 am

Andrey Balan

LDEV-4932 Add CSRF to Assessment monitoring

Options
    • -0
    • +2
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -3
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -1
    • +2
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
    • -1
    • +3
    /lams_tool_assessment/web/pages/monitoring/statisticpart.jsp
5:36 am

Andrey Balan

LDEV-4944 Take care about VSAs edited by several teachers simultaneously

Options
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -3
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -15
    • +18
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
Thursday 16 Jan 2020
6:17 pm

Marcin Cieslak

LDEV-4898 Fix race condition when generating a LD SVG

Options
    • -28
    • +41
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
4:24 pm

Marcin Cieslak

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

Options
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200116.sql
    • -0
    • +4
    /lams_common/src/java/org/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
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java
5:56 am

Andrey Balan

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

Options
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java
4:06 am

Andrey Balan

LDEV-4875 Add "cursor:pointer" to drag-and-drop answers

Options
    • -0
    • +3
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
3:43 am

Andrey Balan

LDEV-4875 Prevent monitors from allocating empty or autosaved answers

Options
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
    • -1
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Wednesday 15 Jan 2020
5:57 am

Andrey Balan

LDEV-4928 Update TBL monitor and Excel export to fully support VSA type

Options
    • -1
    • +6
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -10
    • +26
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -35
    • +79
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -1
    • +1
    /lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp
Tuesday 14 Jan 2020
5:43 pm

Marcin Cieslak

Merge branch 'LDEV-4941' into v4.0

Options
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
    • -18
    • +23
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -1
    • +2
    /lams_central/web/qb/authoring/addQuestionFooter.jsp
    • -3
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java
    • -4
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -5
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java