Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5032 Add anonymous confidence levels in Scratchie

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

Conflicts:

lams_tool_scratchie/web/pages/learning/results.jsp

  1. … 1 more file in changeset.
LDEV-5022 Make burning questions paragraphs work with jqGrid editing

  1. … 1 more file in changeset.
LDEV-4997 Add height auto grow feature and parameter

  1. … 3 more files in changeset.
LDEV-4997 Add height auto grow feature and parameter

  1. … 3 more files in changeset.
LDEV-5002 Make discussion panel collapsible

Conflicts:

lams_tool_scratchie/web/pages/learning/scratchies.jsp

  1. … 1 more file in changeset.
LDEV-5002 Make discussion panel collapsible

  1. … 1 more file in changeset.
LDEV-5002 Display user list only when Scratchie is grouped

  1. … 1 more file in changeset.
LDEV-5002 Display user list only when Scratchie is grouped

  1. … 1 more file in changeset.
LDEV-5002 Reduce gap between user names

LDEV-5002 Reduce gap between user names

LDEV-5002 Add question Etherpads in Scratchie

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

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

lams_tool_scratchie/web/pages/learning/scratchies.jsp

  1. … 12 more files in changeset.
LDEV-5002 Add question Etherpads in Scratchie

  1. … 11 more files in changeset.
LDEV-4997 Introduce Etherpad as a JSP tag

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

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

lams_tool_scratchie/web/pages/learning/scratchies.jsp

  1. … 8 more files in changeset.
LDEV-4990 Style results page the same way as learning page in Scratchie

LDEV-4987 Minor adjustments in layout

LDEV-4987 Display Scratchie item score on monitoring page

  1. … 2 more files in changeset.
LDEV-4987 Show score by each Scratchie in results. Show negative percent

  1. … 7 more files in changeset.
LDEV-4975 Upgrade jquery to version 3.4.1

  1. … 16 more files in changeset.
LDEV-4948 Prevent adding enctype="multipart/form-data" to forms

  1. … 4 more files in changeset.
LDEV-4921 Fix ordering for burning question in Scratchie learner

  1. … 1 more file in changeset.
LDEV-4921 Hide question titles in Scratchie burning questions

LDEV-4921 Add question numbering in Scratchie

  1. … 4 more files in changeset.
LDEV-4921 Allow hiding question titles in Learner for Scratchie

  1. … 7 more files in changeset.
LDEV-4880 Add confidence level variations

    • -3
    • +47
    ./parts/confidenceLevelPortrait.jsp
  1. … 19 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

lams_tool_scratchie/web/pages/learning/learning.jsp

  1. … 21 more files in changeset.
LDEV-4875 Fix scratching of MCQ questions

  1. … 1 more file in changeset.
LDEV-4900 Make other tools react to autosave command

  1. … 2 more files in changeset.
LDEV-4745 Set general burning question's uid to 0

  1. … 1 more file in changeset.