lams-github / lams_tool_assessment

web

Clone Tools

Stats

Commits this week: 0
Total Committers: 15
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 27 Apr 2020
6:13 pm

Marcin Cieslak

LDEV-5009 Add student's choices table to Assessment regular monitor

Options
    • -0
    • +100
    ./pages/monitoring/parts/mcqStudentChoices.jsp
    • -0
    • +7
    ./pages/monitoring/summary.jsp
    • -98
    • +2
    ./pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  4. … 2 more files in changeset.
Wednesday 22 Apr 2020
9:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
9:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
8:04 pm

Marcin Cieslak

LDEV-5002 Move advanced Etherpad option in authoring

Options
    • -11
    • +11
    ./pages/authoring/advance.jsp
8:04 pm

Marcin Cieslak

LDEV-5002 Move advanced Etherpad option in authoring

Options
    • -11
    • +11
    ./pages/authoring/advance.jsp
2:59 pm

Marcin Cieslak

LDEV-5002 Show Etherpads in Assessment monitoring user summary page

Conflicts:

lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

Options
    • -0
    • +28
    ./pages/monitoring/parts/usersummary.jsp
  2. … 1 more file in changeset.
2:59 pm

Marcin Cieslak

LDEV-5002 Show Etherpads in Assessment monitoring user summary page

Options
    • -1
    • +29
    ./pages/monitoring/parts/usersummary.jsp
  2. … 1 more file in changeset.
2:07 pm

Marcin Cieslak

LDEV-5002 Make "show Etherpads" option disabled, not hidden

Options
    • -3
    • +5
    ./pages/authoring/advance.jsp
2:07 pm

Marcin Cieslak

LDEV-5002 Make "show Etherpads" option disabled, not hidden

Options
    • -3
    • +5
    ./pages/authoring/advance.jsp
Tuesday 21 Apr 2020
6:07 pm

Marcin Cieslak

LDEV-4999 Fix monitor role detection when updating learner mark

Options
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
    • -232
    • +232
    ./pages/monitoring/statisticpart.jsp
  3. … 462 more files in changeset.
Monday 20 Apr 2020
9:57 pm

Marcin Cieslak

LDEV-5002 Add advanced authoring option to control Etherpads display

Options
    • -3
    • +10
    ./pages/authoring/advance.jsp
  2. … 3 more files in changeset.
9:57 pm

Marcin Cieslak

LDEV-5002 Add advanced authoring option to control Etherpads display

Conflicts:

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java

Options
    • -3
    • +10
    ./pages/authoring/advance.jsp
  2. … 3 more files in changeset.
9:28 pm

Marcin Cieslak

LDEV-5002 Add Etherpads after each question in Assessment

Options
    • -0
    • +8
    ./pages/learning/learning.jsp
    • -0
    • +29
    ./pages/learning/parts/allquestions.jsp
  3. … 5 more files in changeset.
9: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
    ./pages/learning/learning.jsp
    • -0
    • +29
    ./pages/learning/parts/allquestions.jsp
  3. … 5 more files in changeset.
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    ./WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    ./WEB-INF/tlds/lams/lams.tld
  4. … 86 more files in changeset.
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    ./WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    ./WEB-INF/tlds/lams/lams.tld
  4. … 86 more files in changeset.
Saturday 21 Mar 2020
9: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
    ./common/header.jsp
    • -1
    • +1
    ./common/tabbedheader.jsp
    • -1
    • +1
    ./pages/authoring/randomQuestion.jsp
    • -5
    • +5
    ./pages/monitoring/parts/questionsummary.jsp
    • -2
    • +2
    ./pages/monitoring/statisticpart.jsp
    • -5
    • +5
    ./pages/tblmonitoring/assessment.jsp
    • -4
    • +4
    ./pages/tblmonitoring/assessmentStudentChoices.jsp
    • -4
    • +4
    ./pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  9. … 191 more files in changeset.
Thursday 05 Mar 2020
11: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
    ./pages/tblmonitoring/assessment.jsp
Tuesday 25 Feb 2020
3:48 pm

Ernie Ghiglione

LDEV-4932 adding CSRF to assessment TBL page

Options
    • -1
    • +3
    ./pages/tblmonitoring/assessment.jsp
3:43 pm

Ernie Ghiglione

LDEV-4932 adding CSRF to assessment TBL page

Options
    • -1
    • +3
    ./pages/tblmonitoring/assessment.jsp
Wednesday 29 Jan 2020
6:07 am

Andrey Balan

LDEV-4951 Migrate MCQ tool to Assessment

Options
    • -0
    • +11
    ./pages/monitoring/summary.jsp
  2. … 10 more files in changeset.
Thursday 23 Jan 2020
6:40 am

Andrey Balan

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

Options
    • -1
    • +0
    ./403.jsp
    • -1
    • +0
    ./404.jsp
    • -0
    • +6
    ./WEB-INF/web.xml
    • -1
    • +1
    ./common/taglibs.jsp
    • -1
    • +1
    ./error.jsp
    • -1
    • +0
    ./login.jsp
  7. … 167 more files in changeset.
Wednesday 22 Jan 2020
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
    ./pages/authoring/parts/questionlist.jsp
  2. … 4 more files in changeset.
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
    ./pages/authoring/parts/questionlist.jsp
  2. … 4 more files in changeset.
Tuesday 21 Jan 2020
4:23 am

Andrey Balan

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

Options
    • -4
    • +4
    ./pages/learning/learning.jsp
  2. … 4 more files in changeset.
Friday 17 Jan 2020
6:04 am

Andrey Balan

LDEV-4932 Add CSRF to Assessment monitoring

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

Andrey Balan

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

Options
    • -15
    • +18
    ./pages/monitoring/parts/questionsummary.jsp
  2. … 4 more files in changeset.
Thursday 16 Jan 2020
4:06 am

Andrey Balan

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

Options
    • -0
    • +3
    ./pages/monitoring/parts/questionsummary.jsp
Friday 10 Jan 2020
6:10 am

Andrey Balan

LDEV-4932 Add CSRF to QB bank calls

Options
    • -2
    • +2
    ./pages/authoring/basic.jsp
  2. … 32 more files in changeset.
Thursday 09 Jan 2020
3:59 pm

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
    • -2
    • +3
    ./WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +2
    ./pages/authoring/authoring.jsp
    • -1
    • +1
    ./pages/monitoring/monitoring.jsp
    • -1
    • +1
    ./pages/monitoring/parts/questionsummary.jsp
    • -1
    • +1
    ./pages/monitoring/parts/usersummary.jsp
    • -9
    • +10
    ./pages/monitoring/summary.jsp
    • -1
    • +7
    ./pages/tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +7
    ./pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  9. … 87 more files in changeset.