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

  1. … 161 more files in changeset.
Merge lams2_3_jboss5 changes into lams2_3

  1. … 99 more files in changeset.
LDEV-2366 Tool adapters to allow multiple integrated servers to user them

Committing core changes for this JIRA

  1. … 20 more files in changeset.
LDEV-2071:Fixed DTD reference in lams_admin.

LDEV-2205 Didnt commit all the required files for the group admin view

  1. … 5 more files in changeset.
LDEV-2205 Adding in course-level admin to enable/disable gradebook for a course

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

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

    • -0
    • +136
    ./tags/TextSearch.tag
  1. … 22 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

    • -196
    • +111
    ./fckeditor/tlds/FCKeditor.tld
  1. … 38 more files in changeset.
LDEV-2113: Update FCKEditor.tag

  1. … 16 more files in changeset.
LDEV-2099 - Alter registration module for lc integration, altering registration action and form to talk to lc server instead of redirecting to it

  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-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: Implementing Flashless learner required two new tags to be added. Copying across all projects.

    • -0
    • +45
    ./tags/LearnerFlashEnabled.tag
    • -0
    • +79
    ./tags/ProgressOutput.tag
  1. … 50 more files in changeset.
Removing log4j.xml from the project as it is confusing having log4j in multiple projects.

  1. … 1 more file in changeset.
LDEV-1296 Changed build so that logs are written to rams.log for RAMS, not lams.log.

Another task is still pending

(Also, need to differentiate between LAMS entries in the system.log and the RAMS entries.)

  1. … 1 more file 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-1324 Allow group admins/managers to edit group details, but not group permissions; group's status editable by admin/manager when 'canChangeStatusOfCourse' is enabled; refactored organisation related jsps into their own directory.

  1. … 8 more files in changeset.
handle non-integers

  1. … 4 more files in changeset.
add ldap attributes for all LAMS user attributes

  1. … 6 more files in changeset.
merge ldap changes from HEAD to this branch, branched from 2.0.4

  1. … 56 more files in changeset.
adding ldap database synchronisation and screen

Replaced <bean:message> with <fmt:message> tags

  1. … 15 more files in changeset.
update lams:help tag with style attribute, mainly for lams_admin to display properly

  1. … 16 more files in changeset.
LDEV-1259 bulk import groups via spreadsheet

  1. … 9 more files in changeset.
LDEV-1255: Moving the code for stopping jsps caching to a new custom tag, so that it can be applied consistently across all pages. Moved the utf-8 statements to the same tag so we don't have to remember to put them in all pages.

  1. … 173 more files in changeset.
merge with lams2_0_3 tag on HEAD

  1. … 125 more files in changeset.