• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merging 2.0.2 changes from the HEAD

    • -2
    • +2
    /lams_tool_lamc/db/sql/tool_insert.sql
    • -2
    • +2
    /lams_tool_laqa/db/sql/tool_insert.sql
    • -1
    • +1
    /lams_tool_larsrc/db/sql/tool_insert.sql
    • -1
    • +1
    /lams_tool_notebook/db/sql/tool_insert.sql
    • -2
    • +2
    /lams_tool_sbmt/db/sql/tool_insert.sql
    • -2
    • +2
    /lams_tool_scribe/db/sql/tool_insert.sql
    • -1
    • +1
    /lams_tool_survey/db/sql/tool_insert.sql
    • -1
    • +1
    /lams_tool_vote/db/sql/tool_insert.sql
Merging 2.0.2 changes from the HEAD

    • -0
    • +0
    /lams_central/web/lams_shared_library.jsp
    • -7
    • +7
    /lams_common/db/sql/insert_unix_config_data.sql
    • -7
    • +7
    /lams_common/db/sql/insert_windows_config_data.sql
    • -2
    • +2
    /lams_tool_chat/db/sql/tool_insert.sql
  1. … 4 more files in changeset.
Merged from 2.0.2 Release on head.

    • binary
    /lams_central/src/flash/lam_addseq_wiz.fla
    • binary
    /lams_central/src/flash/lams_authoring_main.fla
    • binary
    /lams_central/src/flash/lams_wizard_main.fla
Merged from 2.0.2 Release on head.

    • binary
    /lams_central/src/flash/lams_authoring.fla
Merged from 2.0.2 Release on head.

    • binary
    /lams_central/src/flash/preloader.fla
    • binary
    /lams_central/src/flash/preloader_wizard.fla
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • binary
    /lams_central/web/lams_preloader.swf
    • binary
    /lams_central/web/lams_preloader_wizard.swf
    • -0
    • +0
    /lams_central/web/lams_shared_library.jsp
*** empty log message ***

    • binary
    /lams_central/src/flash/lams_monitoring_v1.fla
Merged from 2.0.2 Release on head.

Merged from 2.0.2 Release on head.

    • -7
    • +7
    /lams_common/db/sql/insert_unix_config_data.sql
    • -7
    • +7
    /lams_common/db/sql/insert_windows_config_data.sql
updated monitor lock view with prettier appearance and improved functionality: editing user can continue editing, other users can check availability from view and monitor loads if becomes available

  1. … 3 more files in changeset.
labels added for locked view

Need to trigger an upgrade to scribe so that the valid_flag will be reset by the installer. Covers problems with a 2.0.1 -> 2.0.2 install.

Need to trigger an upgrade to scribe so that the valid_flag will be reset by the installer. Covers problems with a 2.0.1 -> 2.0.2 install.

final code for the 2.0.2 installer/updater

also includes backup utility and the reverter code (unfinished)

    • -10
    • +13
    /win_installer/BUILD-InstallerUpdater.txt
    • -0
    • +3
    /win_installer/backup.txt
    • -0
    • +20
    /win_installer/src/backup.ini
    • binary
    /win_installer/src/backup.nsh
    • binary
    /win_installer/src/backup.nsi
    • -0
    • +33
    /win_installer/src/revert-dir.ini
    • binary
    /win_installer/src/revert.nsi
    • binary
    /win_installer/src/updateLocales.sql
updated authoring, monitoring, wizard to load their library swf's from a common (swf serving) jsp.

    • binary
    /lams_monitoring/web/lams_wizard_library.swf
Updating lams_monitoring_library.swf

    • -0
    • +10
    /lams_monitoring/web/WEB-INF/web.xml
updated authoring, monitoring, wizard to load their library swf's from a common (swf serving) jsp.

    • binary
    /lams_central/src/flash/lam_addseq_wiz.fla
    • binary
    /lams_central/src/flash/lams_wizard_main.fla
    • binary
    /lams_monitoring/web/lams_monitoring.swf
    • binary
    /lams_monitoring/web/lams_monitoring_library.swf
    • binary
    /lams_monitoring/web/lams_wizard.swf
updated authoring, monitoring, wizard to load their library swf's from a common (swf serving) jsp.

    • binary
    /lams_central/src/flash/lams_authoring.fla
    • binary
    /lams_central/src/flash/lams_authoring_main.fla
    • binary
    /lams_central/src/flash/lams_monitoring_v1.fla
    • binary
    /lams_central/src/flash/lams_wizard_main.fla
    • -0
    • +35
    /lams_central/web/lams_shared_library.jsp
updated authoring, monitoring, wizard to load their library swf's from a common (swf serving) jsp.

    • binary
    /lams_central/src/flash/lam_addseq_wiz.fla
    • 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
    • binary
    /lams_monitoring/web/lams_wizard.swf
    • binary
    /lams_monitoring/web/lams_wizard_library.swf
Removing './' from jar name - added by the tool deployer

    • -2
    • +2
    /lams_tool_chat/db/sql/tool_insert.sql
    • -2
    • +2
    /lams_tool_forum/db/sql/tool_insert.sql
    • -2
    • +2
    /lams_tool_lamc/db/sql/tool_insert.sql
    • -2
    • +2
    /lams_tool_laqa/db/sql/tool_insert.sql
    • -1
    • +1
    /lams_tool_larsrc/db/sql/tool_insert.sql
    • -1
    • +1
    /lams_tool_notebook/db/sql/tool_insert.sql
    • -2
    • +2
    /lams_tool_sbmt/db/sql/tool_insert.sql
    • -2
    • +2
    /lams_tool_scribe/db/sql/tool_insert.sql
    • -1
    • +1
    /lams_tool_survey/db/sql/tool_insert.sql
    • -1
    • +1
    /lams_tool_vote/db/sql/tool_insert.sql
Update scipts for nb and chat to allow the update fom 2.0 to 2.0.2, just the same as previous update scripts for 2.0.1 but with diff names

Change to tool deployer so that scribe is hidden correctly when it is updated. Ie its valid flag is set in lams_tool and disabled in lams_learning_library

fixed preloaded to append build no parameter to library file that is loaded

    • binary
    /lams_central/src/flash/preloader.fla
    • binary
    /lams_central/src/flash/preloader_wizard.fla
    • binary
    /lams_central/web/lams_preloader.swf
    • binary
    /lams_central/web/lams_preloader_wizard.swf
Update tool version for LDEV-1175

lams-tool-deploy.jar has RemoveModuleFromApplicationXML class in it now

merged changes

updated passon tag

    • -1
    • +2
    /lams_admin/web/WEB-INF/tags/Passon.tag
    • binary
    /lams_central/web/WEB-INF/tags/Passon.tag
    • -1
    • +2
    /lams_tool_nb/web/WEB-INF/tags/Passon.tag
    • binary
    /lams_tool_notebook/web/WEB-INF/tags/Passon.tag
monitoring flash dict fix - two missing labels

When the system gates are removed, we need to remove the references to them in any learner's progress records. At present, it checks the current, next and previous entries, and then deletes any references in these three fields + completed and attempted.

When the system gates are removed, we need to remove the references to them in any learner's progress records.

updated hibernate config file for learning design table + fixed monitor locked view control + learner learning design update triggered by version value in passon swf

    • binary
    /lams_central/src/flash/learnerProgress_lc.fla
    • binary
    /lams_learning/web/lams_learner.swf
  1. … 4 more files in changeset.