Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5101 Fix stats link.

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

Conflicts:

lams_build/3rdParty.userlibraries

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/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

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

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/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/model/McUsrAttempt.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/WEB-INF/tags/CKEditor.tag

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

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

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

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

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

  1. … 29 more files in changeset.
LDEV-5101 Enhacing tooltips assessment

LDEV-5101 Fix header in question list in Assessment

Merge branch 'LDEV-5101' into v4.0

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

  1. … 9 more files in changeset.
LDEV-5101 Allow question version change in Assessment tool

  1. … 2 more files in changeset.
LDEV-5101 Allow global question change initiation from Assessment

  1. … 1 more file in changeset.
LDEV-5107: adding MS word imports to Assessment authoring

  1. … 2 more files in changeset.
LDEV-5081 Apply correct redesigned CSS for bootstrap table

    • -84
    • +87
    ./parts/questionlistRestricted.jsp
  1. … 1 more file in changeset.
LDEV-5081 Rename file prototypes to real names used in Assessment

    • -86
    • +84
    ./parts/questionlistRestricted.jsp
    • -94
    • +0
    ./parts/questionlistRestricted5.jsp
  1. … 9 more files in changeset.
LDEV-5080 Allow non-collapsible Panel

  1. … 1 more file in changeset.
LDEV-5080 Refactor new design CSS file

  1. … 3 more files in changeset.
LDEV-5081 Simplify authoring grid layout

  1. … 2 more files in changeset.
LDEV-5081 Drop jGrowl in favour of bootstrap toast for question edit

  1. … 1 more file in changeset.
LDEV-5081 Drop thickbox in favour of bootstrap modal for question edit

  1. … 1 more file in changeset.
LDEV-5081 Rewrite reflect auto enable code to jQuery

LDEV-5081 Use badges instead of button in question list

LDEV-5081 Rewrite questions table to bootstrap 4.5

    • -0
    • +166
    ./parts/questionlist5.jsp
    • -0
    • +94
    ./parts/questionlistRestricted5.jsp
  1. … 2 more files in changeset.
LDEV-5080 Rewrite AuthoringButton tag to bootstrap 4.5

  1. … 3 more files in changeset.
LDEV-5081 Make adjustments to grid layout of Assessment authoring

  1. … 3 more files in changeset.
LDEV-5080 Rewrite Question Bank search panel contents to bootstrap 4.5

  1. … 3 more files in changeset.
LDEV-5080 Rewrite Question Bank outer panel to bootstrap 4.5

  1. … 1 more file in changeset.
LDEV-5080 Rewrite OutcomeAuthoring tag to bootstrap 4.5

  1. … 6 more files in changeset.
LDEV-5081 Allow proper saving of redesigned Assessment authoring

  1. … 2 more files in changeset.
LDEV-5081 Extract and rewrite Assessment remaining authoring tabs

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.