• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merging RAMS and Edit On Fly changes from branch to the head.

    • -0
    • +104
    ./web/WEB-INF/struts/struts-config.xml
  1. … 65 more files in changeset.
Updating English

  1. … 6 more files in changeset.
Updating English

  1. … 6 more files in changeset.
Updating Greek, Italian, Norwegian and POlish

Changes in lesson/workflow, lams/rams, student/participant, etc

  1. … 22 more files in changeset.
LDEV-1219 trim login string for whitespace

Merging changes from head

Removing LAMS from titles, updating FCKEditor to remove lams from the path and to stop file uploads on the maintain jsp page.

Updated the FCKEditor tag to remove hardcoded "lams" from path.

  1. … 50 more files in changeset.
Updating entries - still a few references to "LAMS" left.

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

LDEV-167 forgot this file during original commit

LDEV-1212 - remove EARDir path from static/final variable so EARDir changes are registered on the fly

removing Configuration.get(EARDir) from static final file paths

news_page_path shouldn't be static final if it includes 'Configuration.get(EARDir)', since a sysadmin may need to change value of EARDir

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

add canJoinJointLessons and canOfferJointLessons checkboxes to organisation edit screen

configure shibboleth attribute header names in lams_configuration table

  1. … 6 more files in changeset.
Updating English, Spanish

LDEV-167 new screen for sysadmins for cleaning up temp files

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

    • -220
    • +0
    ./conf/language/ApplicationResources.properties
    • -220
    • +0
    ./conf/language/ApplicationResources_da_DK.properties
    • -220
    • +0
    ./conf/language/ApplicationResources_el_GR.properties
    • -220
    • +0
    ./conf/language/ApplicationResources_en_AU.properties
    • -220
    • +0
    ./conf/language/ApplicationResources_es_ES.properties
    • -209
    • +0
    ./conf/language/ApplicationResources_fr_FR.properties
    • -213
    • +0
    ./conf/language/ApplicationResources_it_IT.properties
    • -220
    • +0
    ./conf/language/ApplicationResources_ko_KR.properties
    • -220
    • +0
    ./conf/language/ApplicationResources_no_NO.properties
    • -213
    • +0
    ./conf/language/ApplicationResources_pl_PL.properties
    • -220
    • +0
    ./conf/language/ApplicationResources_sv_SE.properties
    • -220
    • +0
    ./conf/language/ApplicationResources_vi_VN.properties
  1. … 165 more files in changeset.
Merged 2.0.1 release changes from HEAD.

    • -209
    • +0
    ./conf/language/ApplicationResources.properties
    • -203
    • +0
    ./conf/language/ApplicationResources_da_DK.properties
    • -209
    • +0
    ./conf/language/ApplicationResources_es_ES.properties
    • -209
    • +0
    ./conf/language/ApplicationResources_fr_FR.properties
    • -203
    • +0
    ./conf/language/ApplicationResources_it_IT.properties
    • -202
    • +0
    ./conf/language/ApplicationResources_ko_KR.properties
    • -203
    • +0
    ./conf/language/ApplicationResources_no_NO.properties
    • -209
    • +0
    ./conf/language/ApplicationResources_pl_PL.properties
    • -209
    • +0
    ./conf/language/ApplicationResources_sv_SE.properties
    • -209
    • +0
    ./conf/language/ApplicationResources_vi_VN.properties
  1. … 190 more files in changeset.
Updated Portugeuse translation.

Language key "sysadmin.library.createtime" was created on the I18N website as "sysadmin.library.createtim" - easiest to change the jsp to match.

Updating Greek, Norwegian

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