Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5171 tooltips

  1. … 2 more files in changeset.
LDEV-5171 Add question stats and colour indication to choices table

    • -13
    • +63
    ./pages/monitoring/studentChoices.jsp
  1. … 4 more files in changeset.
LDEV-5182 Fix ordering in non-empty burning questions

    • -39
    • +25
    ./pages/monitoring/parts/burningQuestions.jsp
  1. … 2 more files in changeset.
LDEV-5179 Add mark hedging question type support to Scratchie

  1. … 5 more files in changeset.
LDEV-5175 Remove unnecessary icon in Scratchie monitoring

LDEV-5175 Use TBL burning questions layout in monitoring in Scratchie

    • -0
    • +172
    ./pages/monitoring/parts/burningQuestions.jsp
    • -164
    • +0
    ./pages/tblmonitoring/burningQuestions.jsp
  1. … 3 more files in changeset.
LDEV-5176 Adding contextual help and small layout changes

    • -111
    • +134
    ./pages/authoring/advance.jsp
  1. … 5 more files in changeset.
LDEV-5172 spacing burning questions and change label

LDEV-5173 Show which learner is leader in Doku monitoring

  1. … 2 more files in changeset.
LDEV-5169 Adding labels and frontend

    • -5
    • +21
    ./pages/monitoring/parts/statisticpart.jsp
  1. … 5 more files in changeset.
LDEV-5151 Adding extra contextual info for item analytics

    • -91
    • +115
    ./pages/monitoring/parts/statisticpart.jsp
LDEV-5143 Fix marking all learners with star when there is no leader

LDEV-5143 Refresh Scratchie monitoring after leader change

Tables in summary tab need to reflect the change.

LDEV-5143 Allow promoting to leader a learner who did not reach activity

  1. … 21 more files in changeset.
LDEV-5143 Allow changing leader in Scratchie monitoring

  1. … 5 more files in changeset.
LDEV-5143 Improve layout of wait for leader and change leader screens.

  1. … 15 more files in changeset.
LDEV-5019 Fix a typo when displaying students' choices in Scratchie

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

    • -16
    • +91
    ./pages/authoring/parts/itemlist.jsp
  1. … 28 more files in changeset.
LDEV-5136 labels and tooltips

  1. … 1 more file in changeset.
LDEV-5136 Enable double click revealing in Scratchie

  1. … 3 more files in changeset.
LDEV-5132 Improve indication of good/bad VSA answers in monitoring

    • -16
    • +39
    ./pages/monitoring/studentChoices.jsp
  1. … 2 more files in changeset.
LDEV-5120 Allow hiding criteria titles in Rating.tag

  1. … 31 more files in changeset.
LDEV-5127 Adjust reported pad height when toolbar is not displayed

  1. … 32 more files in changeset.
LDEV-5127 Fix pad resizing

  1. … 32 more files in changeset.
LDEV-4604 Scroll to burning questions after refreshing them

Merge branch 'LDEV-5101' into v4.0

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

    • -11
    • +82
    ./pages/authoring/parts/itemlist.jsp
  1. … 8 more files in changeset.
LDEV-5108 Oopps.. forgot to remove old IMS QTI link

LDEV-5114 Add "Save as new version" button to Scratchie

    • -3
    • +27
    ./pages/authoring/parts/addItemFooter.jsp
  1. … 2 more files in changeset.
LDEV-5101 Enhacing tooltips