lams-github

Clone Tools
  • 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
    /lams_admin/web/WEB-INF/struts/struts-config.xml
    • -81
    • +85
    /lams_admin/web/WEB-INF/tags/Passon.tag
    • -99
    • +99
    /lams_admin/web/WEB-INF/tags/Tab.tag
    • -52
    • +52
    /lams_admin/web/WEB-INF/tags/TabBody.tag
    • -59
    • +59
    /lams_admin/web/WEB-INF/tags/TabName.tag
    • -69
    • +69
    /lams_admin/web/WEB-INF/tags/Tabs.tag
    • binary
    /lams_build/lib/lams/lams-monitoring.jar
    • binary
    /lams_central/conf/favicon/lams/favicon.ico
    • binary
    /lams_central/conf/favicon/rams/favicon.ico
  1. … 225 more files in changeset.
Added semicolon at end of javascript statement

merged AS codebase from editonfly branch to HEAD

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

    • -238
    • +0
    /lams_build/conf/j2ee/application.xml
    • -0
    • +227
    /lams_build/conf/j2ee/lams.application.xml
    • -0
    • +227
    /lams_build/conf/j2ee/rams.application.xml
Updated license comment. Fixed incorrect file names.

fixed learner icon for optional + parallel activities

    • binary
    /lams_monitoring/web/lams_monitoring.swf
    • binary
    /lams_monitoring/web/lams_monitoring_library.swf
fixed grouping parsing/extracting - problem with changing grouping type and identifier conflict (LDEV-1172)

Updating English

Updating Greek

Updating Italian

Updating English

Updating Welsh, English, Italian

Updating Greek

Updating Vietnamese

Updating Greek, Italian, Norwegian and POlish

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

  1. … 11 more files in changeset.
Updating Wizard. Changed lesson to workflow

Updating RAMS Monitoring

Updating RAMS Authoring

brought back old learner icon + fixed mac fp 9 ext call issue

    • binary
    /lams_central/src/flash/lams_monitoring_v1.fla
brought back old learner icon + fixed mac fp 9 ext call issue

    • 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
remove pointless debug statement

LDEV-1219 trim login string for whitespace

LDEV-1216 make ssl parameters optional

updated learner icon image + some logic to handle display when high volume of learners at one activity

    • binary
    /lams_central/src/flash/lams_monitoring_v1.fla
updated learner icon image + some logic to handle display when high volume of learners at one activity

    • binary
    /lams_monitoring/web/lams_monitoring.swf
    • binary
    /lams_monitoring/web/lams_monitoring_library.swf
LDEV-1210: While fixing the notebook text entry, I cleaned up processNotes to reduce processing - there was processing there that had no effect!

LDEV-1210: Actual notebook entry not appearing - just said "txtEntry" previously. Problem due to jsp syntax.

LDEV-1214: Overwrite any existing files in the content repository - previously we threw an error.

fixed scribe monitoring page - help tag required to be inside content div