lams-github / lams_tool_assessment / web

pages

Clone Tools

Stats

Commits this week: 0
Total Committers: 13
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 20 Apr 2020
3:28 pm

Marcin Cieslak

LDEV-5002 Add Etherpads after each question in Assessment

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.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

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

lams_tool_assessment/web/pages/learning/learning.jsp

Options
    • -0
    • +9
    ./learning/learning.jsp
    • -0
    • +29
    ./learning/parts/allquestions.jsp
  3. … 5 more files in changeset.
Saturday 21 Mar 2020
2:47 am

Andrey Balan

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

Options
    • -1
    • +1
    ./authoring/randomQuestion.jsp
    • -5
    • +5
    ./monitoring/parts/questionsummary.jsp
    • -2
    • +2
    ./monitoring/statisticpart.jsp
    • -5
    • +5
    ./tblmonitoring/assessment.jsp
    • -4
    • +4
    ./tblmonitoring/assessmentStudentChoices.jsp
    • -4
    • +4
    ./tblmonitoring/iraAssessmentStudentChoices.jsp
  7. … 193 more files in changeset.
Thursday 05 Mar 2020
4:45 am

Marcin Cieslak

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

Conflicts:

lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

Options
    • -1
    • +1
    ./tblmonitoring/assessment.jsp
Tuesday 25 Feb 2020
8:48 am

Ernie Ghiglione

LDEV-4932 adding CSRF to assessment TBL page

Options
    • -1
    • +3
    ./tblmonitoring/assessment.jsp
8:43 am

Ernie Ghiglione

LDEV-4932 adding CSRF to assessment TBL page

Options
    • -1
    • +3
    ./tblmonitoring/assessment.jsp
Tuesday 28 Jan 2020
11:07 pm

Andrey Balan

LDEV-4951 Migrate MCQ tool to Assessment

Options
    • -0
    • +11
    ./monitoring/summary.jsp
  2. … 10 more files in changeset.
Wednesday 22 Jan 2020
2: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
    ./authoring/parts/questionlist.jsp
  2. … 4 more files in changeset.
2: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
    ./authoring/parts/questionlist.jsp
  2. … 4 more files in changeset.
Monday 20 Jan 2020
9:23 pm

Andrey Balan

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

Options
    • -4
    • +4
    ./learning/learning.jsp
  2. … 4 more files in changeset.
Thursday 16 Jan 2020
11:04 pm

Andrey Balan

LDEV-4932 Add CSRF to Assessment monitoring

Options
    • -1
    • +2
    ./monitoring/parts/questionsummary.jsp
    • -1
    • +3
    ./monitoring/statisticpart.jsp
  3. … 2 more files in changeset.
10:36 pm

Andrey Balan

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

Options
    • -15
    • +18
    ./monitoring/parts/questionsummary.jsp
  2. … 4 more files in changeset.
Wednesday 15 Jan 2020
9:06 pm

Andrey Balan

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

Options
    • -0
    • +3
    ./monitoring/parts/questionsummary.jsp
Thursday 09 Jan 2020
11:10 pm

Andrey Balan

LDEV-4932 Add CSRF to QB bank calls

Options
    • -2
    • +2
    ./authoring/basic.jsp
  2. … 32 more files in changeset.
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
    • -1
    • +2
    ./authoring/authoring.jsp
    • -1
    • +1
    ./monitoring/monitoring.jsp
    • -1
    • +1
    ./monitoring/parts/questionsummary.jsp
    • -1
    • +1
    ./monitoring/parts/usersummary.jsp
    • -9
    • +10
    ./monitoring/summary.jsp
    • -1
    • +7
    ./tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +7
    ./tblmonitoring/iraAssessmentStudentChoices.jsp
  8. … 88 more files in changeset.
Wednesday 08 Jan 2020
10:44 pm

Andrey Balan

LDEV-4932 Add CSRF Excel export in tools

Options
    • -4
    • +1
    ./monitoring/summary.jsp
  2. … 9 more files in changeset.
Tuesday 07 Jan 2020
11:34 pm

Andrey Balan

LDEV-4932 Add CSRF to LD export and Excel export

Options
    • -1
    • +7
    ./tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +7
    ./tblmonitoring/iraAssessmentStudentChoices.jsp
  3. … 11 more files in changeset.
Thursday 02 Jan 2020
2:00 pm

Ernie Ghiglione

LDEV-4932 removing multipart encoding

There are plenty of form we set the multipart encoding for uploading files, but no files are uploaded. This has implications for CSRF tokens. So we remove the enctype="multipart/form-data" for all the authoring forms that aren't needed.

Options
    • -1
    • +1
    ./authoring/authoring.jsp
  2. … 14 more files in changeset.
Wednesday 01 Jan 2020
12:43 am

Ernie Ghiglione

LDEV-4932 Passing CSRF token as a post rather than get

Options
    • -2
    • +2
    ./authoring/authoring.jsp
  2. … 41 more files in changeset.
Monday 30 Dec 2019
10:14 pm

Andrey Balan

LDEV-4932 Secure save tool authoring with CSRF Guard

Options
    • -1
    • +2
    ./authoring/authoring.jsp
  2. … 42 more files in changeset.
Saturday 28 Dec 2019
9:49 am

Ernie Ghiglione

LDEV-4932 Adding CSRF to Assessment monitoring

Adding CSRF to:

- Change user marks

- Disclose correct answers

- Disclose group answers

Options
    • -1
    • +1
    ./monitoring/parts/questionsummary.jsp
    • -1
    • +1
    ./monitoring/parts/usersummary.jsp
    • -5
    • +9
    ./monitoring/summary.jsp
  4. … 2 more files in changeset.
Tuesday 24 Dec 2019
11:28 pm

Andrey Balan

LDEV-4932 Secure edit in monitor with CSRF Guard

Options
    • -5
    • +7
    ./monitoring/editactivity.jsp
  2. … 2 more files in changeset.
10:47 pm

Andrey Balan

LDEV-4932 Secure setting submission deadline with CSRF Guard

Options
    • -1
    • +1
    ./monitoring/monitoring.jsp
  2. … 63 more files in changeset.
Thursday 05 Dec 2019
3:53 pm

Marcin Cieslak

LDEV-4921 Introduce MCQ admin page. Allow hiding question titles.

Add numbering in authoring and excel export.

Options
    • -0
    • +38
    ./admin/config.jsp
    • -0
    • +6
    ./authoring/parts/questionlist.jsp
    • -0
    • +6
    ./authoring/parts/questionlistRestricted.jsp
    • -2
    • +2
    ./monitoring/summary.jsp
  5. … 10 more files in changeset.
12:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4887 QTI import done within TBL template

Options
    • -1
    • +1
    ./authoring/parts/addessay.jsp
    • -1
    • +1
    ./authoring/parts/addmultiplechoice.jsp
    • -5
    • +5
    ./authoring/parts/questionlist.jsp
  4. … 1 more file in changeset.
12:43 am

Marcin Cieslak

LDEV-4920 Import QTI questions to Assessment after adding them to QB

Options
    • -0
    • +39
    ./authoring/basic.jsp
  2. … 1 more file in changeset.
Tuesday 26 Nov 2019
3:29 pm

Andrey Balan

LDEV-4860 Grey out labels for disabled checkboxes

Options
    • -2
    • +4
    ./authoring/advance.jsp
Friday 22 Nov 2019
6:51 pm

Andrey Balan

LDEV-4880 Add confidence level variations

Options
    • -15
    • +40
    ./authoring/advance.jsp
    • -0
    • +5
    ./learning/learning.jsp
    • -1
    • +23
    ./learning/parts/confidencelevel.jsp
    • -0
    • +3
    ./learning/results.jsp
    • -1
    • +23
    ./learning/results/confidencelevel.jsp
    • -0
    • +10
    ./monitoring/monitoring.jsp
    • -0
    • +12
    ./monitoring/parts/questionsummary.jsp
    • -0
    • +12
    ./monitoring/parts/usersummary.jsp
  9. … 12 more files in changeset.
Tuesday 19 Nov 2019
2:43 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

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

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

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

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/LearningController.java

lams_tool_scratchie/web/pages/learning/learning.jsp

Options
    • -24
    • +23
    ./learning/learning.jsp
  2. … 21 more files in changeset.
Monday 11 Nov 2019
5:06 pm

Marcin Cieslak

LDEV-4900 Trigger autosave when force completing Assessment activity

Options
    • -2
    • +2
    ./learning/learning.jsp
  2. … 5 more files in changeset.
3:54 pm

Marcin Cieslak

LDEV-4900 Make Assessment autosave a recognisable function

Options
    • -24
    • +23
    ./learning/learning.jsp