Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

  1. … 94 more files in changeset.
LDEV-4746 Migrate Assessment to QB

  1. … 77 more files in changeset.
LDEV-4794 TBLmonitor display question numbering only if setting is ON

LDEV-4759 Autocomplete restyling, started Assessment updates

  1. … 41 more files in changeset.
LDEV-4759 DateTimePicker and Accordians updated

  1. … 390 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 503 more files in changeset.
Merge remote-tracking branch 'origin/master' into lams31

  1. … 12 more files in changeset.
LDEV-4569: simple TBL UI adjustments

  1. … 5 more files in changeset.
LDEV-4575 Show disclose buttons only when corresponding option is ON

LDEV-4569 TBL UI: adjustments

* wrap lesson's name

* revice the LAMS logo at the top left corner

* Make TBL monitor to follow themes

* AEs' tab title is "AEs Questions & Marks" now

  1. … 5 more files in changeset.
LDEV-4540 Allow disclosing correct/groups answers in plain monitoring

  1. … 5 more files in changeset.
LDEV-4540 Refresh learners' results page when monitor discloses answers

  1. … 5 more files in changeset.
LDEV-4540 Add "disclose all" buttons to TBL monitor

  1. … 2 more files in changeset.
LDEV-4540 Disclose answers in TBL monitor and reflect it in learner

  1. … 12 more files in changeset.
Merge branch 'LDEV-4520'

  1. … 1 more file in changeset.
LDEV-4520 Reimplement student choices page in case of Assessment iRA

It should follow the format of Student choices page in case of MCQ iRA.

    • -0
    • +139
    ./iraAssessmentStudentChoices.jsp
  1. … 11 more files in changeset.
LDEV-4520 Fix export excel feature for AEs tab

LKC-89 Add TBL Monitoring code specific for the tools

Add TblMonitoringAction classes and /tblmonitoring/*.jsps to the

tools projects. They will be consumed solely by lams_monitoring

to generate tool specific content required for TBL Monitoring.

Tools themselves won't use those classes and jsps.

    • -0
    • +122
    ./assessmentStudentChoices.jsp
  1. … 48 more files in changeset.