Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

  1. … 166 more files in changeset.
Merge lams2_3 into head

  1. … 125 more files in changeset.
LDEV-2041: Added full functionality of exporting to XLS/CSV to Daco tool.

    • -0
    • +51
    ./pages/export/exportToSpreadsheet.jsp
  1. … 13 more files in changeset.
merging improvements from lams2_3_spring_jboss_tune branch

  1. … 118 more files in changeset.
LDEV-2152: includes next activity icon

    • binary
    ./includes/images/next.png
  1. … 40 more files in changeset.
LDEV-2152: add nextActivity icon to daco CSS

LDEV-2118: Added a pop up message before removing a question in Authoring.

    • -2
    • +2
    ./pages/authoring/parts/questionlist.jsp
  1. … 2 more files in changeset.
LDEV-2150: added icons to save/cancel buttons

  1. … 25 more files in changeset.
LDEV-2118: Fixed some small bugs in Daco code.

LDEV-2005: updating FCKEditor.tag to pass contentfolder id to video reorder fckeditor plugin

  1. … 21 more files in changeset.
Added limits information in Learning for Daco tool.

  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

    • -200
    • +114
    ./WEB-INF/tlds/fckeditor/FCKeditor.tld
  1. … 83 more files in changeset.
LDEV-2113: Update FCKEditor.tag

  1. … 21 more files in changeset.
LDEV-2042: Unnecessary column is not displayed anymore.

LDEV-2012: Added a parameter in finish activity URL. This allows to keep track of currently displayed record.

  1. … 1 more file in changeset.
LDEV-2013: Used <c:out> tags when printing text values. This escapes quotes in strings.

    • -1
    • +1
    ./pages/authoring/parts/addlonglat.jsp
    • -1
    • +1
    ./pages/authoring/parts/answeroptions.jsp
LDEV-1940: Fixed incorrect entries for existing tools.

  1. … 2 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.
New tool icons.

  1. … 1 more file in changeset.
LDEV-1892: Feature has been added.

  1. … 9 more files in changeset.
Added advanced option: notify monitoring teacher when a learner enters the activity.

  1. … 14 more files in changeset.
Changed the activity category - this also changes the tool colour in the authoring view. When adding a question in authoring, area with the question form gets focus.

  1. … 1 more file in changeset.
Fixing issues with "dacoCommon.js" name.

    • -0
    • +38
    ./includes/javascript/dacoCommon.js
Fixing issues with "dacoCommon.js" name.

    • -38
    • +0
    ./includes/javascript/dacoCommon.js
    • -32
    • +0
    ./includes/javascript/dacocommon.js
Added comments. Some additional clean up. Fixed date parsing error.

    • -4
    • +2
    ./pages/authoring/definelaterforbid.jsp
    • -1
    • +2
    ./pages/authoring/parts/addcheckbox.jsp
    • -1
    • +2
    ./pages/authoring/parts/adddropdown.jsp
    • -1
    • +2
    ./pages/authoring/parts/addlonglat.jsp
    • -1
    • +2
    ./pages/authoring/parts/addtextarea.jsp
    • -1
    • +2
    ./pages/authoring/parts/addtextfield.jsp
    • -12
    • +16
    ./pages/authoring/parts/answeroptions.jsp
    • -27
    • +0
    ./pages/authoring/parts/questionattachment.jsp
  1. … 27 more files in changeset.
Clean up

  1. … 14 more files in changeset.
Added export portfolio. Fixed sequence export issues. Added reflection functionality. Added horizontal view in monitoring. Added links to external maps in longitude/latitude questions. Multiple minor changes.

    • binary
    ./includes/images/body_bg_learner.jpg
    • binary
    ./includes/images/footer_bg_learner.jpg
    • binary
    ./includes/images/lams_logo.gif
    • binary
    ./includes/images/top_bg_learner.jpg
    • -1
    • +1
    ./includes/javascript/dacoAuthoring.js
    • -0
    • +38
    ./includes/javascript/dacoCommon.js
    • -21
    • +18
    ./includes/javascript/dacoLearning.js
    • -2
    • +2
    ./includes/javascript/dacoMonitoring.js
  1. … 76 more files in changeset.
Added statistics in monitoring. Changed navigation method in monitoring record list. Multiple minor changes.

    • -0
    • +127
    ./includes/javascript/dacoAuthoring.js
    • -0
    • +23
    ./includes/javascript/dacoMonitoring.js
    • -127
    • +0
    ./includes/javascript/dacoQuestion.js
    • -1
    • +1
    ./pages/authoring/definelaterforbid.jsp
    • -1
    • +1
    ./pages/authoring/parts/addcheckbox.jsp
    • -1
    • +1
    ./pages/authoring/parts/adddropdown.jsp
    • -1
    • +1
    ./pages/authoring/parts/addlonglat.jsp
  1. … 90 more files in changeset.