Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge lams2_3 to head (continuing...)

  1. … 49 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-2254 Safari and VR Author fixed

LDEV-2286

VR tool now deployed as archived .war

LDEV-2281

Lessons with VR tool activities are now exported correctly

Author recordings are held locally on LAMS server

LDEV-2289

Popup now shown if EITHER media server settings are blank (both required for VR to work)

LDEV-2005

Export for learner/teacher working

Conditions tab removed

Author recordings added to FCK content folder

Preview images uploaded to own content folder for each VR session

  1. … 161 more files in changeset.
LDEV-2190 - Adding course-level view to gradebook

  1. … 16 more files in changeset.
LDEV-2174: Added shared context support to tool adapters. Added some code comments explaining how everything works.

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

    • -0
    • +4
    ./applicationContext.xml
  1. … 118 more files in changeset.
LDEV-2173 - First commit for gradebook stuff

First monitor interface implemented, teachers can look by activity to mark the students work

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

  1. … 25 more files in changeset.
LDEV-1998: Added preview/export/import functionality for Pedagogical Planner nodes. Fixed some bugs. Added some code comments.

    • -0
    • +129
    ./fckeditor/tlds/FCKeditor.tld
  1. … 21 more files in changeset.
LDEV-1998: Added template management for Pedagogical Planner editor.

    • -0
    • +129
    ./jstl/tlds/FCKeditor.tld
  1. … 25 more files in changeset.
LDEV-2005 - Voice recording tool - FCKEditor plugin present - Changes to configuration file for Red5 settings - Updates to VideoRecorderForFCK (Flex)

  1. … 76 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-1998: Added FCKeditors for several tools. Adjusted styles for IE.

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

  1. … 21 more files in changeset.
LDEV-2108 - Creating backend functionality to allow importing sequences from lamscommunity

  1. … 9 more files in changeset.
LDEV-1998: Additions: - Central: added some files that were not committed earlier and prevented Planner from opening in a pop up window. - Q&A: fixed minor bug with question indexing. - Chat: Planner now strips Instructions from HTML tags. - Notebook: Planner now strips Instructions from HTML tags; fixed bug that set Online Instructions = Offline Instructions (!); Added tooltip with editing advice; adjusted planner form size.

  1. … 16 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. … 110 more files in changeset.
LDEV-1977 make a lams-central action that takes a relative LAMS url and redirects to it, so the users are taken through the login page if neccessary.

- Adding checking to make sure that a user cannot access monitor unless they have permission, see LDEV-1978

  1. … 6 more files in changeset.
LDEV-1606: Several minor changes in the base files.

    • -160
    • +164
    ./struts/struts-config.xml
  1. … 6 more files in changeset.
LDEV-1606: Added common code for creating text based conditions.

    • -0
    • +136
    ./tags/TextSearch.tag
  1. … 10 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-1581: Added most of the logic for creating/managing learner's choice grouping.

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

  1. … 19 more files in changeset.
LDEV-1649: Adding a new servlet to support copying tool content in a batch. This will be used when copying complex activities in authoring.

  1. … 3 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. … 21 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.
forgot to commit tiles definition for all my lessons jsp