Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5157 Add code style option in essay questions authoring

  1. … 5 more files in changeset.
LDEV-4836 Fix initial search of QB

When QB was initially displayed, it showed all question types, not only

ones that were selected.

LDEV-5145 Labels, tooltip and various layout changes

  1. … 5 more files in changeset.
LDEV-5114 Allow new version enforce also for essay questions

LDEV-5114 Allow new version enforce also for true/false questions

LDEV-5114 Enforce question new version on demand

  1. … 2 more files in changeset.
LDEV-5101 Prepare a placeholder for QB question versions

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

  1. … 1 more file in changeset.
LDEV-5081 Apply correct redesigned CSS for Free jqGrid

  1. … 2 more files in changeset.
LDEV-5080 Drop jGrowl in favour of toast for QB question search

LDEV-5082 Make sure that a QB collection name is returned as string

LDEV-5080 Rewrite Question Bank search panel contents to bootstrap 4.5

    • -0
    • +153
    ./qbQuestionDetails5.jsp
  1. … 2 more files in changeset.
LDEV-5024 fixing label

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 error pop up on attempt of uploading incorrect file

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

  1. … 2 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. … 8 more files in changeset.
LDEV-5059 Add missing labels for Question Bank

  1. … 1 more file in changeset.
LDEV-5055 Use letters instead of numbers for all question types

  1. … 1 more file in changeset.
LDEV-5055 Colour display order circle for a correct option

  1. … 2 more files in changeset.
LDEV-5055 Use letters instead of numbers for options in authoring

  1. … 1 more file in changeset.
LDEV-5050 Move "is required" attribute from QB question to tools

  1. … 22 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. … 184 more files in changeset.
LDEV-4958 Set content folder ID in form when creating a QB question

LDEV-4941 Prevent "stealing" a QB question

Prevent changing an existing question's collection if it is not in one

of user's own collections

  1. … 7 more files in changeset.
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.