• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2420 Adding functionality to add new themes to the database. All that is left now is to remove the defunct tables that are not used

  1. … 18 more files in changeset.
file edit.gif was added on branch lams2_3_release on 2010-03-04 02:47:22 +0000

Adding an edit image for central

LDEV-2420 Some adjustments to make rtl appear better in ie

file applications.jsp was initially added on branch lams2_3_oauth.

oauth support functional but not production ready (tokens currently stored in address columns of lams_user). added new share resource type for google docs which are retrieved via oauth and saved as html files in content repository.

  1. … 23 more files in changeset.
LDEV-2420 Merging the stylesheets so there is only one defaultHTML.css file, to make it easier to implement themes.

Applying the same changes to defaultHTML_rtl.css, as well as some further merging

LDEV-2420 Merging the stylesheets so there is only one defaultHTML.css file, to make it easier to implement themes

  1. … 2 more files in changeset.
LDEV-2387 simplified rendering of FCKEditor

* removed commented JS part from FCKEditor jsp tag

* removed fckeditorheader.jsp

* got rid of any references to fckeditor.js, fckcontroller.js, fckeditor.css

  1. … 96 more files in changeset.
merge fix for LDEV-2381 from lams2_3_release branch

LDEV-2381 'add lesson' link not initialised for thickbox when group contents had to be expanded

LDEV-2375: Added "Back" button in Planner Template editor.

  1. … 4 more files in changeset.
file thickbox.patched.js was added on branch lams2_3_release on 2010-02-26 21:10:34 +0000

    • -0
    • +0
    ./includes/javascript/thickbox.patched.js
Recreated/updated several resources removed by previous merge.

    • -28
    • +13
    ./includes/javascript/thickbox.patched.js
  1. … 3 more files in changeset.
merge lams2_3 to head

  1. … 17 more files in changeset.
Fixed some merging bugs preventing preview to start correctly.

  1. … 1 more file in changeset.
Merge lams2_3 to head (continuing...)

    • -27
    • +0
    ./pedagogical_planner/defaultActivityForm.jsp
    • -437
    • +0
    ./pedagogical_planner/sequenceChooser.jsp
    • -267
    • +0
    ./pedagogical_planner/templateBase.jsp
  1. … 46 more files in changeset.
more merging lams2_3 into head

    • -22
    • +22
    ./fckeditor/editor/plugins/paint/lang/en.js
    • -17
    • +54
    ./lamscommunity/lamscommunityLogin.jsp
  1. … 27 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
    • +5
    ./includes/javascript/browser_detect.js
    • -1
    • +2
    ./includes/javascript/fckconfig_custom.js
    • -111
    • +0
    ./pedagogical_planner/grouping.jsp
  1. … 201 more files in changeset.
remove merge conflict flags

Merge lams2_3 into head

  1. … 161 more files in changeset.
Undo-ing some changes to return to 2.3 branch

  1. … 7 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. … 7 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
    ./includes/javascript/thickbox.patched.js
  1. … 15 more files in changeset.
Undoing some changes not meant for 2.3.1 particularly for LDEV-2389

  1. … 13 more files in changeset.
LDEV-2369: Added further tutorial video functionality: user can disable single video, or all of them in his profile. Also, a dialog after first login is displayed.

Additionally, a small bug preventing Ped Planner to be properly deployed during whole LAMS build was fixed.

  1. … 12 more files in changeset.
LDEV-1998: Added initial version of tutorial video overlay.

  1. … 1 more file in changeset.
file tutorialVideo.jsp was initially added on branch lams2_3.

LDEV-2365

Added customcsv to DesignDataModel

  1. … 1 more file in changeset.
LDEV-2366

Changes for tool adaptors reflected in Flash

  1. … 2 more files in changeset.