Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2387 simplified rendering of FCKEditor

* removed commented JS part from FCKEditor jsp tag

* removed fckeditorheader.jsp

* got rid of any references to fckeditor.js, fckcontroller.js, fckeditor.css

  1. … 96 more files in changeset.
Merge lams2_3 to head (continuing...)

  1. … 50 more files in changeset.
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.
LDEV-2005 = VideoRecorder tool and FCKEditor video recorder updated - export portfolio fixed - export fck recordings fixed - conditions added - preview images are now produced and displayed - more feedback for rating - instructions highlighted - clicking delete button does not trigger viewing of recording - timer display corrected - prompt validation - misc bugs

LDEV-2197 = Presence Chat updated

- no longer stacking in ie7

- scrolling improved

- logged conversations are fetched on open new tab

- status messages no longer shown in chat boxes, user icons change instead

- minimize/maximize button shown on presence tab

iFrame fixed for ie6

    • -0
    • +136
    ./tags/TextSearch.tag
  1. … 50 more files in changeset.
merging improvements from lams2_3_spring_jboss_tune branch

    • -0
    • +4
    ./applicationContext.xml
    • -109
    • +109
    ./struts/struts-config.xml
  1. … 117 more files in changeset.
Oopps... it was UTF-8

Reverting wrong commit

LDEV-2152: adding next activity icon tto system activities

  1. … 3 more files in changeset.
LDEV-2150: added icons to save/cancel buttons

  1. … 25 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-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

  1. … 85 more files in changeset.
LDEV-2113: Update FCKEditor.tag

  1. … 21 more files in changeset.
LDEV-2074 Updated the Progress Engine to handle floating (reference) activities, activation from the progress bar and progress status of the activities. Display floating activities in non-flash progress bar with valid links to launch the activities (to-do: still need to fix window pop-up size).

  1. … 1 more file in changeset.
LDEV-2074 Updated the Progress Engine to handle floating (reference) activities, activation from the progress bar and progress status of the activities. Display floating activities in non-flash progress bar with valid links to launch the activities (to-do: still need to fix window pop-up size).

  1. … 9 more files in changeset.
LDEV-1932: Added competences to export portfolio both for teacher and learner.

  1. … 7 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-1299: Added some logic for the new "condition gate" that allows learners to pass depending on condition satisfaction.

  1. … 35 more files in changeset.
LDEV-1581: Added most of the logic for creating/managing learner's choice grouping.

    • -104
    • +109
    ./struts/struts-config.xml
  1. … 31 more files in changeset.
LDEV-1811 lams.tld has been updated in all packages

  1. … 19 more files in changeset.
LDEV-1246

Renamed lams:out attribute escapeXml to escapeHtml

  1. … 15 more files in changeset.
LDEV-1005: Added lesson name to headings, added help button, improved layout, improved browser compatibility on the page sizing, added scrolling to the iframe, hide the branches that the user isn't doing, adding support for the jump ahead in preview.

  1. … 20 more files in changeset.
LDEV-1005: Implementing a non-Flash learner interface

    • -0
    • +45
    ./tags/LearnerFlashEnabled.tag
    • -0
    • +75
    ./tags/ProgressOutput.tag
  1. … 48 more files in changeset.
LDEV-1349 Changes to the lams:fckeditor tag to map FCKEditor language files to LAMS supported languages and locales.

FCKEditor.tag changes

  1. … 14 more files in changeset.
LDEV-1402: Support empty branches by going straight to the next activity - this will be supported in the authoring client as a normal branch.

  1. … 4 more files in changeset.
LDEV-1134: Preview now lets the author select a branch to view, but the author can only do one branch. To view all branches, the author needs to run preview multiple times.

  1. … 5 more files in changeset.
Replaced <bean:message> with <fmt:message> tags

  1. … 15 more files in changeset.
LDEV-1134: Branching: View screen for the class export portfolio

  1. … 11 more files in changeset.
Refactoring code so that all screens can update the progress bar.

  1. … 18 more files in changeset.
Stop it deploying the classes directory under WEB-INF - this can give us class conflicts as the code ends up in two places.

  1. … 25 more files in changeset.