Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge lams2_3 into head

  1. … 125 more files in changeset.
merging improvements from lams2_3_spring_jboss_tune branch

  1. … 118 more files in changeset.
Added repositoryService via spring

Removed calls to RepositoryProxy class.

LDEV-2171

  1. … 18 more files in changeset.
LDEV-1998:Added Instructions field to Vote and Share Resources tools.

  1. … 4 more files in changeset.
LDEV-2143 Vote tool causing heap memory leak. The VoteUsrAttemptDAO class was bringing the entire VoteUsrAttempt table into the memory space, then traversing it programatically which is very un-advisable.

I changed the hql queries to only get the rows needed for the processing and the memory leak seems to be at a much more acceptable level

Committing for head

LDEV-1998: Added Pedagogical Planner editor with add/edit node functionality.

  1. … 46 more files in changeset.
LDEV-1998: Added FCKeditors for several tools. Adjusted styles for IE.

  1. … 19 more files in changeset.
LDEV-1998: Added Editing advice for all tools. Added FCKEditor for Notebook, Chat and Submit Files.

  1. … 45 more files in changeset.
LDEV-1998: Committing Pedagogical Planner base files and support for chat, forum, multiple choice, Q&A, noticeboard, notebook and vote tools.

  1. … 104 more files in changeset.
LDEV-1916 adding autopatch to tools, including db_version_insert.sql script to tool deployer

  1. … 71 more files in changeset.
LDEV-1662 Putting in advanced options summary into monitoring summary page for every tool.

vote

  1. … 1 more file in changeset.
LDEV-1699 uncomment call to setup reflections data for export

LDEV-1705

Removed open vote from export and monitoring

  1. … 1 more file in changeset.
LDEV-1661 Added list of open votes to results display when open votes are allowed.

  1. … 4 more files in changeset.
LDEV-1661 Applied custom MessageService to Voting tool, and I18N'd Open Vote label for results table.

LDEV-1705 Fixed Open Vote row displaying when not enabled.

  1. … 1 more file in changeset.
LDEV-1669: When requesting the potential number of users, voting was asking using the internal voting id, rather the core's session id. As this was a call to the core, this resulted in the wrong number of users being returned.

LDEV-1205

Changed define later page to open in edit mode.

LDEV-1205

Changed define later page to open in edit mode.

LDEV-1205

Changed define later page to open in edit mode.

  1. … 2 more files in changeset.
LDEV-1612: Final code tweaks to get the learner part working.

  1. … 1 more file in changeset.
LDEV-1612: Tweaking the condition names for OUTPUT_SET_BOOLEAN type definitions, so that Flash can match existing conditions back to their definitions.

  1. … 1 more file in changeset.
LDEV-1612: Trying out the new OUTPUT_SET_BOOLEAN type for custom conditions (the new type is assigned to the definition of the conditions).

LDEV-1594: Learner selection now supports open vote. Also improved the handling of an option that is just an image - now it cuts off any leading path so you can see the filename easily.

LDEV-1594: Improved the HTML stripping so that if only an image in the html, it tries to pull out out the link in the "src" entry and display that only.

LDEV-1594: Added a new flag "showConditionNameOnly". When this is true, Flash will hide the details of the condition (e.g. Range blah to blah). Needed for the default Voting activity as the condition details are meaningless to the user.

The question (in the condition text) now has the HTML stripped the same as the legend on the chart, giving some chance of a meaning text if there is other text in the question field.

LDEV-1597: Added new advanced object ShowResults, which controls whether or not the full results are shown. The user can still see their votes in export portfolio and if they return to the voting screen.

Typo in the context file - was excluding the wrong exception type.

LDEV-1594: Adding a basic tool output. Only works if there is at most one nomination and the learner can't enter their own values.

  1. … 4 more files in changeset.
LDEV-1578: Export portfolio problems: learner export didn't have the html removed/shortened in the legend and the class export only worked if you had already generated a chart. Both these problems now fixed.