lams_central

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Updating Japanese

Merge lams2_3 to head (continuing...)

    • -0
    • +1
    ./web/WEB-INF/struts/struts-config.xml
    • -267
    • +0
    ./web/pedagogical_planner/templateBase.jsp
  1. … 45 more files in changeset.
LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

  1. … 81 more files in changeset.
more merging lams2_3 into head

    • -0
    • +57
    ./web/fckeditor/editor/plugins/paint/content.jsp
    • -22
    • +22
    ./web/fckeditor/editor/plugins/paint/lang/en.js
    • binary
    ./web/images/css/course_gradebook.png
    • binary
    ./web/images/css/mark.png
    • binary
    ./web/images/css/my-grades.png
    • -0
    • +38
    ./web/lamscommunity/community.jsp
  1. … 18 more files in changeset.
Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

  1. … 153 more files in changeset.
remove merge conflict flags

Merge lams2_3 into head

  1. … 120 more files in changeset.
Merge lams2_3 into head

  1. … 32 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch). Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

    • -0
    • +342
    ./web/includes/javascript/thickbox.patched.js
  1. … 11 more files in changeset.
LDEV-2344 Fixed support act button disappearing after certain actions if optional menu visible

  1. … 4 more files in changeset.
LDEV-2347 Fixed Support activity mistakedly thinks it's getting dropped on another activity outside of branching

LDEV-2347 Fixed Support activity mistakedly thinks it's getting dropped on another activity outside of branching

  1. … 1 more file in changeset.
LDEV-2344 Fixed support act btn being disabled when it shouldn't be

  1. … 2 more files in changeset.
LDEV-2301 Fixed branch to end gate not redrawing properly after moving the activity in a certain way

  1. … 1 more file in changeset.
LDEV-2337 Fixed not being able to set min/max activity values for optionals back to 0 after the design had been saved

  1. … 1 more file in changeset.
LDEV-2288 Transition snap back now checks against a change in the transitions y coordinate (as well as the x coordinate)

  1. … 2 more files in changeset.
LDEV-2296 fixed min/max steppers showing values above the number of sequences(optional sequences)/activities(optional activities)

  1. … 1 more file in changeset.
LDEV-2318 Increased amount of space provided to display validation issues so that messages are not truncated in systems that have wider font characters (eg in linux)

  1. … 1 more file in changeset.
LDEV-2333 Fixed import from lamscommunity window size, identifier and minor bug where the normal import window would be launched mistakenly if the design was modified (unsaved)

  1. … 1 more file in changeset.
LDEV-2162 Now when grouping selection method changed to "number of learners" a confirmation message is presented if group to branch mappings exist

  1. … 1 more file in changeset.
LDEV-2298 Recovered designs no longer marked as read-only

  1. … 1 more file in changeset.
LDEV-2295 Tool output conditions now updating properly

  1. … 2 more files in changeset.
VideoRecorder tool and FCKPlugin now use AjaxOverlay

LDEV-2254 Safari and VR Author fixed

LDEV-2286

VR tool now deployed as archived .war

LDEV-2281

Lessons with VR tool activities are now exported correctly

Author recordings are held locally on LAMS server

LDEV-2289

Popup now shown if EITHER media server settings are blank (both required for VR to work)

LDEV-2005

Export for learner/teacher working

Conditions tab removed

Author recordings added to FCK content folder

Preview images uploaded to own content folder for each VR session

    • -45
    • +11
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +1
    ./web/flashxml/authoring/en_dictionary.xml
  1. … 148 more files in changeset.
LDEV-2271 Stopped author from trying to paste the selected activity when the workspace dialog is open resulting in an error dialog

  1. … 1 more file in changeset.
LDEV-2266 Fixed activities disappearing into support activity container from inside branching

  1. … 1 more file in changeset.
LDEV-2267 Fixed competence editor not updating description

  1. … 1 more file in changeset.
LDEV-2269 Fixed Transition tool becoming active after using shortcut keys

  1. … 1 more file in changeset.
*** empty log message ***

    • binary
    ./web/fckeditor/editor/plugins/paint/FCK Paint.swf
paint plugin and modified lams connector

    • -49
    • +0
    ./web/fckeditor/editor/plugins/paint/content.html