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

    • -0
    • +9
    ./authoring/feedback5.jsp
    • -0
    • +17
    ./authoring/leader5.jsp
    • -0
    • +17
    ./authoring/reflection5.jsp
LDEV-5081 Extract and rewrite Assessment advanced authoring tab

    • -0
    • +228
    ./authoring/advance5.jsp
LDEV-5081 Extract and rewrite Assessment authoring questions tab

Question list and Question Bank panel still require rewriting.

    • -0
    • +237
    ./authoring/questions5.jsp
LDEV-5081 Extract and rewrite Assessment authoring basic tab

    • -0
    • +21
    ./authoring/basic5.jsp
LDEV-5080 Introduce Dropdown tag

    • -462
    • +372
    ./authoring/authoring5.jsp
  1. … 2 more files in changeset.
LDEV-5080 Introduce Switch tag

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

    • -679
    • +660
    ./authoring/authoring5.jsp
  1. … 2 more files in changeset.
LDEV-5080 Make Panel tag customisable

    • -592
    • +539
    ./authoring/authoring5.jsp
  1. … 2 more files in changeset.
LDEV-3716 Fix label reference so correct option gets checked

LDEV-5080 Initial version of panel tag

    • -117
    • +108
    ./authoring/authoring5.jsp
  1. … 2 more files in changeset.
LDEV-5080 Use redesigned dummy tool authoring template in Assessment

    • -0
    • +802
    ./authoring/authoring5.jsp
  1. … 26 more files in changeset.
Merge remote-tracking branch 'origin/v4.0' into LDEV-5080

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java

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

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

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

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

    • -2
    • +2
    ./authoring/parts/questionlistRestricted.jsp
  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-5067 Do not show disclose group answers if activity is not grouped

LDEV-5066 Do not show uncofigured Etherpad option in Assessment

  1. … 1 more file in changeset.
LDEV-5065 Confirm before disclosing answers in Assessment monitoring

  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. … 24 more files in changeset.
LDEV-4917 Add Uppy file uploads to QTI question import

  1. … 6 more files in changeset.
LDEV-3716 Allow checking Assessment mcq options when clicking on label

LDEV-4921 Hide question titles in Assessment

  1. … 1 more file in changeset.
LDEV-5015 missing >

LDEV-5052 rendering question title

LDEV-5050 Control if question is required from Assessment authoring

    • -0
    • +7
    ./authoring/parts/questionlistRestricted.jsp
  1. … 1 more file in changeset.
LDEV-5015 Hide iRA student choices button if there are no learners

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

  1. … 10 more files in changeset.
LDEV-5041 Use CSS instead of deprecated HTML attributes

    • -13
    • +13
    ./monitoring/parts/timeLimit.jsp
LDEV-5041 add/fix labels and modify the monitor UI stlightly

    • -33
    • +40
    ./monitoring/parts/timeLimit.jsp
  1. … 1 more file in changeset.
LDEV-5041 Allow adding a whole group to individual time limit table

  1. … 3 more files in changeset.