• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Recreated/updated several resources removed by previous merge.

  1. … 5 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. … 211 more files in changeset.
Undo-ing some changes to return to 2.3 branch

  1. … 8 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.

  1. … 8 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
    ./thickbox.patched.js
  1. … 18 more files in changeset.
LDEV-2259 jquery selector was mixing up id values of lessons and orgIds - ideally selector should be 'div#orgId', but this didn't work, so we pass the element itself directly since we already have it.

Committed last changed from HEAD to 2.3 branch

    • -15
    • +4
    ./jquery-ui/ui/ui.tabs.scrollable.js
  1. … 99 more files in changeset.
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

    • -15
    • +4
    ./jquery-ui/ui/ui.tabs.scrollable.js
  1. … 162 more files in changeset.
paint plugin and modified lams connector

  1. … 3 more files in changeset.
LDEV-2208 Prettying up gradebook css

LDEV-2220 gradebook changes suggested by james

  1. … 5 more files in changeset.
LDEV-2243: Added support for chrome and safari4

  1. … 1 more file in changeset.
LDEV-2230: update browser detect to support ie8

LDEV-2230: update browser detect to support ie8

Merging latest changes from HEAD to 2.3 branch

See MAIN:paulg:20090417074901 for details

Also, Video Recorder tool project was replaced completely given that it didn't exist in the 2.3 branch yet

    • -2
    • +1
    ./jquery-ui/themes/cupertino/ui.tabs.css
    • -43
    • +46
    ./jquery-ui/ui/ui.tabs.scrollable.js
  1. … 240 more files in changeset.
LDEV-2005 = VideoRecorder tool and FCKEditor video recorder updated

- export portfolio fixed

- export fck recordings fixed

- conditions added

- preview images are now produced and displayed

- more feedback for rating

- instructions highlighted

- clicking delete button does not trigger viewing of recording

- timer display corrected

- prompt validation

- misc bugs

LDEV-2197 = Presence Chat updated

- no longer stacking in ie7

- scrolling improved

- logged conversations are fetched on open new tab

- status messages no longer shown in chat boxes, user icons change instead

- minimize/maximize button shown on presence tab

iFrame fixed for ie6

    • -2
    • +1
    ./jquery-ui/themes/cupertino/ui.tabs.css
    • -43
    • +46
    ./jquery-ui/ui/ui.tabs.scrollable.js
  1. … 54 more files in changeset.
LDEV-2175: Added Formulae editor to learner (merge to 2.3 branch)

LDEV-2175: Added Formulae editor to learner

LDEV-2173 - Putting most of gradebook into its own project for easier maintainence

Database persistence beans and DAO are staying in lams_common

  1. … 139 more files in changeset.
LDEV-2120 Adding links from index page to gradebook

  1. … 3 more files in changeset.
LDEV-2197 Presence Chat

- Added a scrollbar to Presence user listings

- Changed css

- Scrolling better, still a bit iffy

  1. … 2 more files in changeset.
LDEV-2173 Moving jquery library so jqGrid can keep using 1.2.6 as the new 1.3.2 breaks the search function

    • -0
    • +11
    ./jqgrid/js/jquery-1.2.6.pack.js
  1. … 1 more file in changeset.
- Updated jQuery core to v1.3.2

- Updated jQuery UI to v1.7.1

- Classic Wizard now has checkbox visible to enable Presence Chat

- Learner no longer has a Presence box

- Presence Chat committed

    • -0
    • +412
    ./jquery-ui/themes/base/jquery-ui.css
    • -0
    • +9
    ./jquery-ui/themes/base/ui.accordion.css
    • -0
    • +2
    ./jquery-ui/themes/base/ui.all.css
    • -0
    • +9
    ./jquery-ui/themes/base/ui.base.css
    • -0
    • +37
    ./jquery-ui/themes/base/ui.core.css
    • -0
    • +62
    ./jquery-ui/themes/base/ui.datepicker.css
    • -0
    • +13
    ./jquery-ui/themes/base/ui.dialog.css
    • -0
    • +4
    ./jquery-ui/themes/base/ui.progressbar.css
    • -0
    • +13
    ./jquery-ui/themes/base/ui.resizable.css
    • -0
    • +17
    ./jquery-ui/themes/base/ui.slider.css
    • -0
    • +11
    ./jquery-ui/themes/base/ui.tabs.css
    • -0
    • +243
    ./jquery-ui/themes/base/ui.theme.css
  1. … 250 more files in changeset.
Adding source to customized planner fckconfig

LDEV-2173 Adding monitor link for activities in the activity view

    • -3
    • +3
    ./jqgrid/js/min/grid.setcolumns-min.js
  1. … 5 more files in changeset.
Fixing up the jqgrid show/hide column dialog so it looks better and displays only the required text

    • -3
    • +3
    ./jqgrid/js/min/grid.setcolumns-min.js
LDEV-2173 Fixed up some javascript referencing issues with the jqGrid library, Now it will work server-wide for LAMS (it will not work for RAMS unfortunately at this point but this can be fixed by editing the jquery.jqGrid.js file

  1. … 2 more files in changeset.
LDEV-2179: Added "Export sequence" button.

  1. … 6 more files in changeset.
LDEV-2173 - First commit for gradebook stuff

First monitor interface implemented, teachers can look by activity to mark the students work

    • -0
    • +1482
    ./jqgrid/js/grid.base.js
    • -0
    • +441
    ./jqgrid/js/grid.celledit.js
    • -0
    • +303
    ./jqgrid/js/grid.common.js
    • -0
    • +416
    ./jqgrid/js/grid.custom.js
    • -0
    • +957
    ./jqgrid/js/grid.formedit.js
    • -0
    • +189
    ./jqgrid/js/grid.inlinedit.js
    • -0
    • +72
    ./jqgrid/js/grid.locale-bg.js
    • -0
    • +75
    ./jqgrid/js/grid.locale-de.js
    • -0
    • +72
    ./jqgrid/js/grid.locale-en.js
    • -0
    • +71
    ./jqgrid/js/grid.locale-it.js
    • -0
    • +72
    ./jqgrid/js/grid.locale-pl.js
    • -0
    • +72
    ./jqgrid/js/grid.locale-pt-br.js
    • -0
    • +71
    ./jqgrid/js/grid.locale-pt.js
    • -0
    • +72
    ./jqgrid/js/grid.locale-ru.js
    • -0
    • +71
    ./jqgrid/js/grid.locale-sp.js
  1. … 234 more files in changeset.
Added more actions drop down menu for each group header.

LDEV-2167

  1. … 1 more file in changeset.
LDEV-1998: Added full description for nodes containing templates. Changed "Preview" and "Editor" links position. Changed Lucene filter parameters.

  1. … 5 more files in changeset.