• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merge with lams2_0_3 tag on HEAD

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

    • -0
    • +41
    ./WEB-INF/tags/Head.tag
  1. … 43 more files in changeset.
update list of federation servers from registry

  1. … 8 more files in changeset.
added fed_id column to lams_fed_server (common id number maintained across federation)

  1. … 3 more files in changeset.
file federation.jsp was initially added on branch shibboleth_2_0.

    • -0
    • +0
    ./federation/federation.jsp
New screen in lams_admin for listing federation info and other federation related things

  1. … 7 more files in changeset.
LDEV-1187: forgot to i18n the 'login as' label

  1. … 2 more files in changeset.
LDEV-1187 sysadmin can login as any user, LoginAsAction provides the user/pass and login.jsp handles the automatic login

  1. … 2 more files in changeset.
LDEV-1196 add a create user link to 'find users' page

LDEV-1159: Moving fixed strings into I18N files.

  1. … 4 more files in changeset.
Merging RAMS and Edit On Fly changes from branch to the head.

    • -0
    • +104
    ./WEB-INF/struts/struts-config.xml
  1. … 65 more files in changeset.
Removing LAMS from titles, updating FCKEditor to remove lams from the path and to stop file uploads on the maintain jsp page.

  1. … 2 more files in changeset.
Updated the FCKEditor tag to remove hardcoded "lams" from path.

  1. … 50 more files in changeset.
Updated the FCKEditor tag to remove hardcoded "lams" from path.

  1. … 16 more files in changeset.
LDEV-1213 use & instead of & otherwise firefox pops up an error

LDEV-1213 fixing paths for fckeditor, set contentfolderid=-1 for now

  1. … 2 more files in changeset.
LDEV-167 forgot this file during original commit

login_page_path shouldn't be static final if it includes 'Configuration.get(EARDir)', since a sysadmin may need to change value of EARDir; show error if can't write to login.jsp based on path in EARDir

  1. … 3 more files in changeset.
add canJoinJointLessons and canOfferJointLessons checkboxes to organisation edit screen

  1. … 3 more files in changeset.
LDEV-167 new screen for sysadmins for cleaning up temp files

  1. … 5 more files in changeset.
update to learner for refresh progress bar

  1. … 13 more files in changeset.
updated passon tag

  1. … 13 more files in changeset.
Merging 2.0.1 changes from the HEAD

  1. … 171 more files in changeset.
Merged 2.0.1 release changes from HEAD.

    • -27
    • +202
    ./WEB-INF/struts/struts-config.xml
    • binary
    ./WEB-INF/tags/ImgButtonWrapper.tag
  1. … 190 more files in changeset.
Language key "sysadmin.library.createtime" was created on the I18N website as "sysadmin.library.createtim" - easiest to change the jsp to match.

Id column name changed to match other column names. Not I18N'd as this refers to an actual column name in the database.

LDEV-1129 add org id column

fix some html validator warnings

LDEV-1146: Increase login field length to 255

Had to change login field edit box to take longer length, so made most of the fields wider (there was plenty of room on the page).

add spinning 'loading.gif' when user imports