collection.jsp

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LAI-9 Fix broken links to MCQ question generator

  1. … 1 more file in changeset.
LDEV-5420 Allow selecting which questions to print in QB

  1. … 3 more files in changeset.
LDEV-5420 Add questions print button to Question Bank

  1. … 6 more files in changeset.
LDEV-4828 Appadmins can (un)share any QB collection

  1. … 1 more file in changeset.
Merge branch 'LAI-5' into v4.7

# Conflicts:

# lams_central/web/authoring/authoring.jsp

# lams_central/web/qb/collection.jsp

  1. … 4 more files in changeset.
LAI-5 Add OpenAI MCQ generation to Question Bank collection screen

  1. … 2 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- QB

LDEV-5404 Escaping funny characters that break js

  1. … 1 more file in changeset.
LDEV-5334 Make shared collections available to authors

  1. … 4 more files in changeset.
LDEV-5324 Detect new question version as author changes its details

  1. … 14 more files in changeset.
LDEV-5218 Provide IDs and not UIDs when removing QB questions

LDEV-4534 Ignore clicks outside editable field

The default behaviour is to cancel editing, which many users find

annoying.

  1. … 6 more files in changeset.
LDEV-5218 Allow removing multiple questions on Edit Collection screen

  1. … 2 more files in changeset.
LDEV-4949 Adjust layout of import pop up. Allow importing .docx files.

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/questions/questionFile.jsp

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

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_lamc/web/WEB-INF/tags/Etherpad.tag

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

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

  1. … 25 more files in changeset.
LDEV-4917 Add Uppy file uploads to QTI question import

  1. … 6 more files in changeset.
LDEV-5059 Add central i18n for jqGrid

  1. … 10 more files in changeset.
LDEV-4949 import questions from Word files

  1. … 15 more files in changeset.
LDEV-4949 import questions from Word files

Cherry-pick from 5.0 branch

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/questions/questionFile.jsp

  1. … 15 more files in changeset.
LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

  1. … 198 more files in changeset.
LDEV-4932 Add CSRF to QB bank calls

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

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

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

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

  1. … 1 more file in changeset.
Merge branch 'LDEV-4834' into LDEV-4745

Conflicts:

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

lams_central/web/qb/collection.jsp

lams_central/web/qb/stats.jsp

lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

  1. … 10 more files in changeset.
Merge branch 'LDEV-4745' into LDEV-4836

  1. … 7 more files in changeset.
LDEV-4836 Change authoring to accommodate importing questions from QB

  1. … 76 more files in changeset.
LDEV-4834 Show Learning Outcomes in single QB collection view

  1. … 3 more files in changeset.
LDEV-4828 Add subgrid with previous versions in QB collection view

  1. … 4 more files in changeset.