Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5081 Extract and rewrite Assessment advanced authoring tab

LDEV-5081 Extract and rewrite Assessment authoring questions tab

Question list and Question Bank panel still require rewriting.

LDEV-5081 Extract and rewrite Assessment authoring basic tab

LDEV-5080 Introduce Dropdown tag

  1. … 2 more files in changeset.
LDEV-5080 Introduce Switch tag

  1. … 2 more files in changeset.
LDEV-5080 Introduce new Page tag

  1. … 2 more files in changeset.
LDEV-5080 Make Panel tag customisable

  1. … 2 more files in changeset.
LDEV-5080 Initial version of panel tag

  1. … 2 more files in changeset.
LDEV-5080 Use redesigned dummy tool authoring template in Assessment

  1. … 26 more files in changeset.
LDEV-5078 Fix i18n labels in Arrow tag

  1. … 50 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_assessment/web/pages/authoring/advance.jsp

lams_tool_assessment/web/pages/authoring/authoring.jsp

LDEV-5069 Prevent error when setting blank time limit in Assessment

LDEV-5066 Do not show uncofigured Etherpad option in Assessment

  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-5050 Control if question is required from Assessment authoring

  1. … 1 more file in changeset.
LDEV-5033 Add answer justification to Assessment

  1. … 13 more files in changeset.
LDEV-5041 Allow time limit for learners who did not reach Assessment yet

  1. … 12 more files in changeset.
LDEV-5002 Cosmetic and label changes

  1. … 1 more file in changeset.
LDEV-5002 Cosmetic and label changes

  1. … 1 more file in changeset.
LDEV-5014 Add spinner while QB panel loads in authoring

  1. … 3 more files in changeset.
LDEV-5002 Move advanced Etherpad option in authoring

LDEV-5002 Move advanced Etherpad option in authoring

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

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

LDEV-5002 Add advanced authoring option to control Etherpads display

  1. … 3 more files in changeset.
LDEV-5002 Add advanced authoring option to control Etherpads display

Conflicts:

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

  1. … 3 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-4950 Drag&drop item sorting in Scratchie authoring

Also in Scratchie and Assessment update visible question numbering on

sort.

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

  1. … 4 more files in changeset.