Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4932 Add CSRF to QB bank calls

  1. … 18 more files in changeset.
Merge branch 'LDEV-4745' into v4.0

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

  1. … 18 more files in changeset.
LDEV-4920 Import QTI questions to MCQ after adding them to QB

  1. … 8 more files in changeset.
LDEV-4861 Prevent adding the same question twice

  1. … 5 more files in changeset.
LDEV-4848 Remove an unnecessary label

LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

  1. … 1 more file in changeset.
LDEV-4844 Allow manual QB question merging

  1. … 5 more files in changeset.
LDEV-4889 Display correct/incorrect icons in TBL monitor's Teams tab

  1. … 2 more files in changeset.
Merge branch 'LDEV-4745' into v4.0

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

  1. … 8 more files in changeset.
LDEV-4875 Fixes for VSA feature

  1. … 22 more files in changeset.
LDEV-4875 Add VSA question type to Assessment and Scratchie

    • -0
    • +231
    ./authoring/addVsa.jsp
    • -0
    • +23
    ./authoring/vsaOption.jsp
  1. … 69 more files in changeset.
LKC-215 Modify question review flow

LKC-215 Importing questions from QB to WA

  1. … 1 more file in changeset.
LDEV-4848 Internationalise labels in Question Bank

  1. … 1 more file in changeset.
LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

  1. … 1 more file in changeset.
LDEv-4844 Allow manual QB question merging

  1. … 5 more files in changeset.
LDEV-4838 Move collection processing to common utils method

  1. … 3 more files in changeset.
LDEV-4836 Display limited set of question types for MCQ and Scratchie

LDEV-4836 Advanced search on authoring basic tab

* "Random questions" page in authoring. Add "Select all questions"

button + collections dropdown

  1. … 13 more files in changeset.
LDEV-4746 Skip validation CKEditor for question description

jQuery validation plugin does not seem to work well with CKEditor.

LDEV-4834 Allow LO widget on add new QB question screen

  1. … 1 more file in changeset.
LDEV-4746 Use table as question ID generator for QbQuestion

In the future we can add new columns to lams_sequence_generator, so we

have a single table for generating new IDs instead table-per-ID.

  1. … 10 more files in changeset.
LDEV-4834 Revert to panel LO widget in QB question authoring

LDEV-4834 Use panel-less LO widget in QB question authoring

  1. … 63 more files in changeset.
LDEV-4834 Move Learning Outcomes widget to Settings tab

LDEV-4834 Add Learning Outcomes widget to edit QB question screen

  1. … 2 more files in changeset.
LDEV-4745 Add Stats button to QB search

LDEV-4839 Refine import QB questions feature

  1. … 8 more files in changeset.
LDEV-4836 Cope with random questions

* Properly set content_folder_id for old and new QB questions

* Prepare for recalculate marks after edit in monitor

  1. … 14 more files in changeset.
LDEV-4828 Allow question sorting by usage in lessons on collection page

  1. … 1 more file in changeset.