lams-github

lams_central

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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
Tuesday 04 Feb 2020
4:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Conflicts:

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

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java

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

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

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/web/PortraitActionForm.java
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/web/PortraitController.java
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveController.java
    • -20
    • +27
    ./src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
  5. … 35 more files in changeset.
Monday 03 Feb 2020
6:13 am

Marcin Cieslak

LDEV-4958 Set content folder ID in form when creating a QB question

Options
    • -0
    • +1
    ./web/qb/authoring/addessay.jsp
    • -0
    • +1
    ./web/qb/authoring/addtruefalse.jsp
Friday 31 Jan 2020
4:18 pm

Marcin Cieslak

LDEV-4802 Use redirect instead of forward to QB interface

Using a cross-module forward for some reason prevents modules from

shutting down in the end.

Options
    • -11
    • +9
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
Tuesday 28 Jan 2020
12:17 pm

Marcin Cieslak

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

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
1:48 am

Andrey Balan

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

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
Thursday 23 Jan 2020
7:42 pm

Andrey Balan

Merge branch 'master' into v4.0

Options
    • -0
    • +5
    ./conf/security/Owasp.CsrfGuard.properties
7:26 pm

Andrey Balan

LDEV-4932 Add CSRF to LKC monitoring

Options
    • -0
    • +5
    ./conf/security/Owasp.CsrfGuard.properties
Wednesday 22 Jan 2020
11:50 pm

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_central/web/common/taglibs.jsp

Options
    • -0
    • +5
    ./web/WEB-INF/web.xml
    • -1
    • +1
    ./web/common/taglibs.jsp
11:40 pm

Andrey Balan

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

Options
    • -0
    • +5
    ./web/WEB-INF/web.xml
    • -1
    • +0
    ./web/ckeditor/plugins/jlatexmath/buttons.jsp
    • -1
    • +1
    ./web/ckeditor/plugins/jlatexmath/jlatexmath.jsp
    • -1
    • +0
    ./web/common/taglibs.jsp
    • -1
    • +1
    ./web/error.jsp
  6. … 168 more files in changeset.
11:19 am

Marcin Cieslak

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

Options
    • -68
    • +40
    ./web/lti/addLesson.jsp
Thursday 16 Jan 2020
11:04 pm

Andrey Balan

LDEV-4932 Add CSRF to Assessment monitoring

Options
    • -0
    • +2
    ./conf/security/Owasp.CsrfGuard.properties
  2. … 3 more files in changeset.
11:17 am

Marcin Cieslak

LDEV-4898 Fix race condition when generating a LD SVG

Options
    • -28
    • +41
    ./web/includes/javascript/authoring/authoringGeneral.js
Wednesday 15 Jan 2020
10:56 pm

Andrey Balan

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

(cherry picked from commit 9f6b6a7487f9b5cbf283bf95361e3778e93fde95)

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/web/controller/LtiController.java
  2. … 2 more files in changeset.
10:56 pm

Andrey Balan

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

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/web/controller/LtiController.java
  2. … 2 more files in changeset.
Tuesday 14 Jan 2020
10:43 am

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
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -1
    • +2
    ./web/qb/authoring/addQuestionFooter.jsp
  4. … 5 more files in changeset.
Monday 13 Jan 2020
2:20 pm

Marcin Cieslak

LDEV-4884 Skip QB questions with existing UUID on XML import

Options
    • -1
    • +39
    ./src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
Friday 10 Jan 2020
3:28 pm

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

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

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

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

Options
    • -1
    • +2
    ./conf/security/Owasp.CsrfGuard.properties
  2. … 14 more files in changeset.
Thursday 09 Jan 2020
11:10 pm

Andrey Balan

LDEV-4932 Add CSRF to QB bank calls

Options
    • -0
    • +18
    ./conf/security/Owasp.CsrfGuard.properties
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -7
    • +10
    ./src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -7
    • +8
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
    • -12
    • +9
    ./web/authoring/template/tbl/tbl.jsp
    • -0
    • +1
    ./web/qb/authoring/addVsa.jsp
    • -0
    • +1
    ./web/qb/authoring/addessay.jsp
    • -0
    • +1
    ./web/qb/authoring/addmarkhedging.jsp
    • -0
    • +1
    ./web/qb/authoring/addmatchingpairs.jsp
    • -0
    • +1
    ./web/qb/authoring/addmultiplechoice.jsp
    • -0
    • +1
    ./web/qb/authoring/addnumerical.jsp
    • -0
    • +1
    ./web/qb/authoring/addordering.jsp
    • -0
    • +1
    ./web/qb/authoring/addtruefalse.jsp
  16. … 18 more files in changeset.
4:12 pm

Marcin Cieslak

SP-4 Staff gets only monitor and author roles, not learner

Options
    • -14
    • +23
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
8:59 am

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

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

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

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

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

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

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

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

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# 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/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

Options
    • -0
    • +237
    ./conf/security/Owasp.CsrfGuard.properties
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -2
    • +3
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +35
    ./web/WEB-INF/web.xml
    • -7
    • +4
    ./web/addLesson.jsp
    • -9
    • +6
    ./web/authoring/authoring.jsp
    • -5
    • +1
    ./web/authoring/template/tool/assessmcq.jsp
    • -3
    • +1
    ./web/authoring/template/tool/assessment.jsp
    • -4
    • +1
    ./web/authoring/template/tool/mcquestion.jsp
    • -5
    • +1
    ./web/authoringConfirm.jsp
    • -1
    • +2
    ./web/common/taglibs.jsp
    • -27
    • +44
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -2
    • +7
    ./web/includes/javascript/authoring/authoringMenu.js
    • -7
    • +7
    ./web/includes/javascript/main.js
    • -20
    • +31
    ./web/includes/javascript/orgGroup.js
  16. … 80 more files in changeset.
7:58 am

Marcin Cieslak

LDEV-4932 Adjust CSRF Guard logging

Logger uses LAMS format and logs only warnings (attacks) rather than all

its checks.

Options
    • -1
    • +2
    ./conf/security/Owasp.CsrfGuard.properties
  2. … 3 more files in changeset.
7:34 am

Marcin Cieslak

SP-4 Add teacher to subcourses

Options
    • -35
    • +72
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Wednesday 08 Jan 2020
10:44 pm

Andrey Balan

LDEV-4932 Add CSRF Excel export in tools

Options
    • -1
    • +4
    ./conf/security/Owasp.CsrfGuard.properties
    • -2
    • +8
    ./web/includes/javascript/download.js
  3. … 8 more files in changeset.
Tuesday 07 Jan 2020
11:34 pm

Andrey Balan

LDEV-4932 Add CSRF to LD export and Excel export

Options
    • -0
    • +4
    ./conf/security/Owasp.CsrfGuard.properties
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java
    • -0
    • +1
    ./web/authoring/authoring.jsp
    • -0
    • +1
    ./web/error.jsp
    • -2
    • +7
    ./web/includes/javascript/authoring/authoringMenu.js
    • -2
    • +2
    ./web/profile/portrait.jsp
  7. … 7 more files in changeset.
9:20 pm

Marcin Cieslak

LDEV-4644 Reintroduce an incorrectly deleted CSS file

Options
    • -0
    • +45
    ./web/css/outcome.scss
9:07 pm

Andrey Balan

LDEV-4932 Start using /common/taglibs.jsp in lams_central

Options
    • -5
    • +1
    ./web/authoring/authoring.jsp
    • -6
    • +2
    ./web/authoring/svgGenerator.jsp
    • -10
    • +4
    ./web/authoring/template/createresult.jsp
    • -4
    • +1
    ./web/authoring/template/genericintro.jsp
    • -1
    • +1
    ./web/authoring/template/grouping.jsp
    • -6
    • +1
    ./web/authoring/template/list.jsp
    • -3
    • +1
    ./web/authoring/template/tbl/appex.jsp
    • -5
    • +1
    ./web/authoring/template/tbl/tbl.jsp
    • -1
    • +2
    ./web/authoring/template/tool/assessgradeselector.jsp
    • -5
    • +1
    ./web/authoring/template/tool/assessmcq.jsp
    • -3
    • +1
    ./web/authoring/template/tool/assessment.jsp
    • -3
    • +1
    ./web/authoring/template/tool/assessmentQTI.jsp
    • -3
    • +1
    ./web/authoring/template/tool/assessoption.jsp
    • -3
    • +1
    ./web/authoring/template/tool/assessredooption.jsp
    • -3
    • +1
    ./web/authoring/template/tool/mcoption.jsp
  16. … 54 more files in changeset.
8:52 pm

Marcin Cieslak

SP-4 Provision staff members

Options
    • -211
    • +340
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
8:42 pm

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

Options
    • -0
    • +14
    ./conf/security/Owasp.CsrfGuard.properties
    • -8
    • +8
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/web/PasswordChangeController.java
    • -3
    • +1
    ./src/java/org/lamsfoundation/lams/web/PortraitController.java
    • -6
    • +7
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveController.java
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/web/ProfileSaveController.java
    • -20
    • +31
    ./web/includes/javascript/orgGroup.js
    • -5
    • +22
    ./web/includes/javascript/orgGrouping.js
    • -13
    • +5
    ./web/orgGroup.jsp
    • -2
    • +2
    ./web/orgGrouping.jsp
    • -13
    • +8
    ./web/profile/portrait.jsp
  12. … 40 more files in changeset.
Monday 06 Jan 2020
4:09 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF to add lesson

Options
    • -0
    • +1
    ./conf/security/Owasp.CsrfGuard.properties
    • -2
    • +2
    ./web/addLesson.jsp
  3. … 1 more file in changeset.
Sunday 05 Jan 2020
11:44 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF to Author

- Save, Delete, Copy, Move and rename LDs

- Create folder

Options
    • -0
    • +8
    ./conf/security/Owasp.CsrfGuard.properties
    • -6
    • +7
    ./src/java/org/lamsfoundation/lams/workspace/web/WorkspaceController.java
    • -4
    • +4
    ./web/authoring/authoring.jsp
    • -27
    • +44
    ./web/includes/javascript/authoring/authoringGeneral.js