• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merged monitoring flash dictionaries

Merging 2.0.1 changes from the HEAD

  1. … 28 more files in changeset.
Reapplying edit on the fly changes.

Reapplying edit on the fly changes.

Removing ApplicationResources_el_GK.properties

Fixing Greek

    • -0
    • +185
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
Merging 2.0.1 changes from the HEAD

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

    • -78
    • +0
    /lams_learning/conf/language/ApplicationResources_cy_GB.properties
    • -78
    • +0
    /lams_learning/conf/language/ApplicationResources_de_DE.properties
    • -78
    • +0
    /lams_learning/conf/language/ApplicationResources_en_AU.properties
    • -78
    • +0
    /lams_learning/conf/language/ApplicationResources_es_ES.properties
    • -78
    • +0
    /lams_learning/conf/language/ApplicationResources_it_IT.properties
    • -78
    • +0
    /lams_learning/conf/language/ApplicationResources_mi_NZ.properties
    • -78
    • +0
    /lams_learning/conf/language/ApplicationResources_sv_SE.properties
    • -78
    • +0
    /lams_learning/conf/language/ApplicationResources_vi_VN.properties
  1. … 54 more files in changeset.
Merging 2.0.1 changes from the HEAD

    • -0
    • +11
    /lams_tool_notebook/build.properties
    • -2
    • +1
    /lams_tool_notebook/.settings/org.eclipse.core.resources.prefs
    • -85
    • +0
    /lams_tool_notebook/conf/language/ApplicationResources_ar_JO.properties
    • -85
    • +0
    /lams_tool_notebook/conf/language/ApplicationResources_cy_GB.properties
    • -85
    • +0
    /lams_tool_notebook/conf/language/ApplicationResources_de_DE.properties
    • -85
    • +0
    /lams_tool_notebook/conf/language/ApplicationResources_el_GR.properties
    • -85
    • +0
    /lams_tool_notebook/conf/language/ApplicationResources_en_AU.properties
    • -85
    • +0
    /lams_tool_notebook/conf/language/ApplicationResources_ko_KR.properties
    • -85
    • +0
    /lams_tool_notebook/conf/language/ApplicationResources_mi_NZ.properties
    • -85
    • +0
    /lams_tool_notebook/conf/language/ApplicationResources_no_NO.properties
    • -85
    • +0
    /lams_tool_notebook/conf/language/ApplicationResources_pt_BR.properties
    • -85
    • +0
    /lams_tool_notebook/conf/language/ApplicationResources_sv_SE.properties
  1. … 157 more files in changeset.
Merging 2.0.1 changes from the HEAD

    • binary
    /lams_contentrepository/lib/commons-codec-1.1.jar
    • -2
    • +1
    /lams_tool_chat/.settings/org.eclipse.core.resources.prefs
    • -91
    • +0
    /lams_tool_chat/conf/language/ApplicationResources_ar_JO.properties
    • -98
    • +0
    /lams_tool_chat/conf/language/ApplicationResources_cy_GB.properties
    • -95
    • +0
    /lams_tool_chat/conf/language/ApplicationResources_da_DK.properties
    • -91
    • +0
    /lams_tool_chat/conf/language/ApplicationResources_de_DE.properties
    • -95
    • +0
    /lams_tool_chat/conf/language/ApplicationResources_el_GR.properties
    • -98
    • +0
    /lams_tool_chat/conf/language/ApplicationResources_es_ES.properties
    • -95
    • +0
    /lams_tool_chat/conf/language/ApplicationResources_fr_FR.properties
    • -95
    • +0
    /lams_tool_chat/conf/language/ApplicationResources_pl_PL.properties
  1. … 230 more files in changeset.
Merging 2.0.1 changes from the HEAD

    • -220
    • +0
    /lams_admin/conf/language/ApplicationResources_da_DK.properties
    • -220
    • +0
    /lams_admin/conf/language/ApplicationResources_el_GR.properties
    • -220
    • +0
    /lams_admin/conf/language/ApplicationResources_en_AU.properties
    • -220
    • +0
    /lams_admin/conf/language/ApplicationResources_es_ES.properties
    • -209
    • +0
    /lams_admin/conf/language/ApplicationResources_fr_FR.properties
    • -213
    • +0
    /lams_admin/conf/language/ApplicationResources_it_IT.properties
    • -220
    • +0
    /lams_admin/conf/language/ApplicationResources_ko_KR.properties
    • -220
    • +0
    /lams_admin/conf/language/ApplicationResources_no_NO.properties
    • -213
    • +0
    /lams_admin/conf/language/ApplicationResources_pl_PL.properties
    • -220
    • +0
    /lams_admin/conf/language/ApplicationResources_sv_SE.properties
    • -220
    • +0
    /lams_admin/conf/language/ApplicationResources_vi_VN.properties
  1. … 165 more files in changeset.
updated swfs

    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • binary
    /lams_monitoring/web/lams_monitoring.swf
    • binary
    /lams_monitoring/web/lams_monitoring_library.swf
monitor changes for locked view

added new labels for Author/Monitor dictionary

Merged 2.0.1 release changes from HEAD.

Merged 2.0.1 release changes from HEAD.

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

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

    • -203
    • +0
    /lams_admin/conf/language/ApplicationResources_da_DK.properties
    • -209
    • +0
    /lams_admin/conf/language/ApplicationResources_es_ES.properties
    • -209
    • +0
    /lams_admin/conf/language/ApplicationResources_fr_FR.properties
    • -203
    • +0
    /lams_admin/conf/language/ApplicationResources_it_IT.properties
    • -202
    • +0
    /lams_admin/conf/language/ApplicationResources_ko_KR.properties
    • -203
    • +0
    /lams_admin/conf/language/ApplicationResources_no_NO.properties
    • -209
    • +0
    /lams_admin/conf/language/ApplicationResources_pl_PL.properties
    • -209
    • +0
    /lams_admin/conf/language/ApplicationResources_sv_SE.properties
    • -209
    • +0
    /lams_admin/conf/language/ApplicationResources_vi_VN.properties
  1. … 190 more files in changeset.
removed code for system gate activity+transitions hiding/mod + dictionary label changes + applied layout manager structure to monitor module + added dummy locked monitor view

    • binary
    /lams_central/src/flash/lams_authoring.fla
    • binary
    /lams_central/src/flash/lams_authoring_main.fla
    • binary
    /lams_monitoring/web/lams_monitoring.swf
    • binary
    /lams_monitoring/web/lams_monitoring_library.swf
Updated DictionaryDate for the 2.0.1 release

    • -1
    • +1
    /lams_common/db/sql/insert_unix_config_data.sql
    • -1
    • +1
    /lams_common/db/sql/insert_windows_config_data.sql
assemly dir for the updater, its the product of assemble-ear

    • binary
    /win_installer/assembly/lams.ear/FCKeditor-2.3.jar
    • binary
    /win_installer/assembly/lams.ear/antlr.jar
    • binary
    /win_installer/assembly/lams.ear/axis-ant.jar
    • binary
    /win_installer/assembly/lams.ear/axis.jar
    • binary
    /win_installer/assembly/lams.ear/cglib-nodep-2.1_2.jar
    • binary
    /win_installer/assembly/lams.ear/cglib_jboss404GA.jar
    • binary
    /win_installer/assembly/lams.ear/commons-beanutils.jar
    • binary
    /win_installer/assembly/lams.ear/commons-codec-1.3.jar
    • binary
    /win_installer/assembly/lams.ear/commons-digester.jar
    • binary
    /win_installer/assembly/lams.ear/commons-fileupload.jar
    • binary
    /win_installer/assembly/lams.ear/commons-lang-2.0.jar
    • binary
    /win_installer/assembly/lams.ear/commons-logging.jar
    • binary
    /win_installer/assembly/lams.ear/commons-validator.jar
  1. … 851 more files in changeset.
Fixed bug so the language pack date written to the registry is correct format.

The lams_build\build.xml has also been changed to inlcude a task called deploy-ear-uopdater, which basically copies the assemble dir to win_installer after assemble-ear has been run, this is needed for the updater

removed code for system gate activity+transitions hiding/mod + dictionary label changes + applied layout manager structure to monitor module + added dummy locked monitor view

file DefaultLayoutManager.as was initially added on branch editonfly_branching.

file MonitorLockView.as was initially added on branch editonfly_branching.

removed code for system gate activity+transitions hiding/mod + dictionary label changes + applied layout manager structure to monitor module + added dummy locked monitor view

    • binary
    /lams_central/src/flash/lams_monitoring_v1.fla
  1. … 10 more files in changeset.
Updating Greek

Final changes for 2.0.1 installer

Timestamp works, jsmath works, removes jbosss temp files, runs correctly

    • -0
    • +110
    /win_installer/src/Functions.nsh
    • binary
    /win_installer/src/updateLocales.sql
    • -0
    • +23
    /win_installer/templates/update-core-database.xml
Trying to make licenses line up better with the text above.

Many updater changes for 2.0.1 relese, license and readme changes included