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.
LDEV-2185: missing the userEntry bit

merging improvements from lams2_3_spring_jboss_tune branch

  1. … 118 more files in changeset.
LDEV-1998: Added "Clear entry" icon in activities with collections of entries.

    • -14
    • +38
    ./authoring/pedagogicalPlannerForm.jsp
  1. … 17 more files in changeset.
LDEV-1998:Added Instructions field to Vote and Share Resources tools.

    • -11
    • +24
    ./authoring/pedagogicalPlannerForm.jsp
  1. … 5 more files in changeset.
LDEV-2152: includes next activity icon

    • -3
    • +3
    ./learning/IndividualLearnerResults.jsp
    • -3
    • +3
    ./learning/RevisitedAllNominations.jsp
  1. … 40 more files in changeset.
LDEV-2150: added icons to save/cancel buttons

  1. … 25 more files in changeset.
LDEV-1998: Adjusted layout of tools' PedPlanner form contents.

    • -2
    • +2
    ./authoring/pedagogicalPlannerForm.jsp
  1. … 13 more files in changeset.
LDEV-2005: updating FCKEditor.tag to pass contentfolder id to video reorder fckeditor plugin

  1. … 21 more files in changeset.
LDEV-1998: Made a break between branches/options. When adding multiple questions to Q&A, previous entries are also saved (same in MCQ, Vote and Forum). Added some code comments.

    • -0
    • +1
    ./authoring/pedagogicalPlannerForm.jsp
  1. … 5 more files in changeset.
LDEV-2111: Missing FCKEditor.tag

  1. … 1 more file in changeset.
LDEV-2111 Upgraded FCKEditor to version 2.6.4 and FCKEditor.java (taglibs) to 2.4.1 - displayExpanded default set to true

  1. … 25 more files in changeset.
LDEV-2111 Upgraded FCKEditor to version 2.6.4 and FCKEditor.java (taglibs) to 2.4.1

    • -199
    • +113
    ./WEB-INF/fckeditor/tlds/FCKeditor.tld
  1. … 83 more files in changeset.
LDEV-1998: Added FCKeditors for several tools. Adjusted styles for IE.

    • -3
    • +27
    ./authoring/pedagogicalPlannerForm.jsp
  1. … 19 more files in changeset.
LDEV-2113: Update FCKEditor.tag

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

    • -1
    • +1
    ./authoring/pedagogicalPlannerForm.jsp
  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.

    • -0
    • +48
    ./authoring/pedagogicalPlannerForm.jsp
  1. … 110 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-1912 set session timeout programmatically according to lams' UserInactiveTimeout value via a servlet listener rather than hard coding to 120 mins (in some webapps, no session timeout was specified at all).

  1. … 35 more files in changeset.
LDEV-1811 lams.tld has been updated in all packages

  1. … 19 more files in changeset.
LDEV-1662 wrong closure of the script tab solved in all tools

  1. … 11 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-1705

Removed open vote from export and monitoring

  1. … 5 more files in changeset.
LDEV-1742

Removed NOWRAP from tables.

    • -32
    • +32
    ./monitoring/AllSessionsSummary.jsp
    • -27
    • +27
    ./monitoring/IndividualSessionSummary.jsp
LDEV-1667

Removed group drop down box when only one group is available.

    • -83
    • +83
    ./monitoring/AllSessionsSummary.jsp
    • -87
    • +84
    ./monitoring/IndividualSessionSummary.jsp
LDEV-1661 Added list of open votes to results display when open votes are allowed.

  1. … 5 more files in changeset.
LDEV-1705 Fixed Open Vote row displaying when not enabled.

  1. … 2 more files in changeset.
LDEV-1660 Added line stating no of votes you can have.

  1. … 2 more files in changeset.
LDEV-1704 showResults parameter was missing from the VoteLearningForm.

    • -0
    • +1
    ./learning/IndividualLearnerResults.jsp
LDEV-1703 Fixed bug with edit button showing when reflections are turned OFF.