Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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-4900 Make other tools react to autosave command

  1. … 2 more files in changeset.
LDEV-4863 Q&A authoring to look more like Assessment essay authoring

  1. … 4 more files in changeset.
LDEV-4864 Show question body in Q&A learner

  1. … 1 more file in changeset.
LDEV-4841 Migrate Q&A tool to QB

  1. … 39 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 501 more files in changeset.
LDEV-4759 Authoring and monitoring tabs working

  1. … 314 more files in changeset.
LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

  1. … 138 more files in changeset.
LDEV-4720 Fix LAMS issues that prevented TestHarness to work correctly

  1. … 1 more file in changeset.
LDEV-4720 Fix LAMS issues that prevented TestHarness to work correctly

  1. … 5 more files in changeset.
LDEV-4702 Leaders changed answers appear on refresh

  1. … 2 more files in changeset.
LDEV-4440 Fix a link for redoing Q&A questions

LDEV-4440 Error messages converted to new error tag

  1. … 129 more files in changeset.
LDEV-4440 Fix bug with tablesorter parameter

LDEV-4440 Scribe fixes

  1. … 5 more files in changeset.
LDEV-4440 Pixlr fixes

  1. … 6 more files in changeset.
LDEV-4440 Scribe tool

  1. … 51 more files in changeset.
LDEV-4440 Q&A nostruts library

  1. … 19 more files in changeset.
LDEV-4440 Pixlr fixes

  1. … 37 more files in changeset.
LDEV-4440 Q&A learning

  1. … 6 more files in changeset.
LDEV-4440 Q&A minor fixes

  1. … 1 more file in changeset.
LDEV-4440 Pixlr & Q&A fixes

  1. … 48 more files in changeset.
LDEV-4440 Q&A fixes

  1. … 11 more files in changeset.
LDEV-4440 Q&A authoring and learning fixes

  1. … 7 more files in changeset.
LDEV-4440 Shared resource authoring & Q&A

  1. … 20 more files in changeset.
LDEV-4440 Sared resources - authoring - work in progress

  1. … 30 more files in changeset.
LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

  1. … 43 more files in changeset.
LDEV-4399 Fixing vertical alignment of answers.

Also tweaking the columns of the revisited learner page to

make the sorting arrows appear correctly.

LDEV-4399 Present entries in the order of least commented.

Also reapplied Bootstrap changes to tablesorter so that the sort

icons appear when a column is sorted.

  1. … 4 more files in changeset.
LDEV-4395 Leader related tools use Portrait for leader

Created a tag LeaderDisplay to display the leader consistently

across tools.

  1. … 86 more files in changeset.