• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
improved draw of transition (position of arrow head) - needs to be moved to head

    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
setting position of inserted system gate

More handling for "null" current/next activity - needed for the stop gates being removed.

Also now check that any activity being commenced isn't a live edit + not read only activity. This will stop any user that evades the stop gates from making activities after the stop gate read only - they will not be able to do the next activity. Given that the learning design is already loaded into memory, it shouldn't add greatly to the progress engine steps (not compared to everything else!)

Updating English, Spanish

Updating English

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

    • -0
    • +4
    /lams_admin/conf/xdoclet/struts-forms.xml
    • -0
    • +41
    /lams_admin/web/cleanup.jsp
LDEV-167 refactor cleanup file functions (cleansup lamstmp_* as well as lamszip_* files)

automatically login shib users

add some debug info of request headers; placed 'no groups' message inside div

new login method for shib users, looking at possible ways to store customised shib headers

new login servlet for shib users

    • -0
    • +9
    /lams_central/conf/xdoclet/servlets.xml
file ShibLoginServlet.java was initially added on branch shibboleth_2_0.

add shibboleth authentication method

    • -1
    • +3
    /lams_common/db/sql/insert_types_data.sql
file progressBroken.jsp was initially added on branch editonfly_branching.

    • -0
    • +0
    /lams_learning/web/progressBroken.jsp
Trying to make progress engine cope with "holes" in the progress ie if the user's current activity disappears (e.g. temporary system gate and live edit end)

    • -2
    • +2
    /lams_learning/web/optionsActivity.jsp
    • -0
    • +37
    /lams_learning/web/progressBroken.jsp
    • -1
    • +1
    /lams_learning/web/layout/gateLayout.jsp
update to learner for refresh progress bar

    • -2
    • +5
    /lams_admin/web/WEB-INF/tags/Passon.tag
    • -2
    • +5
    /lams_tool_nb/web/WEB-INF/tags/Passon.tag
    • binary
    /lams_tool_notebook/web/WEB-INF/tags/Passon.tag
update to learner for refresh progress bar

    • binary
    /lams_central/src/flash/lams_learner.fla
    • binary
    /lams_central/web/WEB-INF/tags/Passon.tag
    • binary
    /lams_learning/web/lams_learner.swf
merger from head + monitoring dictionary update

    • binary
    /lams_central/src/flash/lams_monitoring_v1.fla
merger from head + monitoring dictionary update

    • binary
    /lams_central/src/flash/lam_addseq_wiz.fla
    • binary
    /lams_central/src/flash/lams_authoring.fla
    • binary
    /lams_central/src/flash/lams_authoring_main.fla
    • binary
    /lams_central/src/flash/lams_wizard_main.fla
    • binary
    /lams_central/src/flash/learnerProgress_lc.fla
    • binary
    /lams_central/src/flash/preloader.fla
    • binary
    /lams_central/src/flash/preloader_wizard.fla
    • binary
    /lams_monitoring/web/lams_wizard.swf
merger from head + monitoring dictionary update

    • 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
    • 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
Final cosmetic changes for the backup utility. Enjoy!

    • -0
    • +9
    /win_installer/src/backup-finish.ini
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.