Clone Tools
  • 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.
Adding an edit image for central

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

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-2375: Added "Back" button in Planner Template editor.

  1. … 4 more files in changeset.
Recreated/updated several resources removed by previous merge.

    • -28
    • +13
    ./includes/javascript/thickbox.patched.js
    • -0
    • +102
    ./tutorialVideo.jsp
  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

    • -0
    • +57
    ./fckeditor/editor/plugins/paint/content.jsp
    • -22
    • +22
    ./fckeditor/editor/plugins/paint/lang/en.js
    • binary
    ./images/css/course_gradebook.png
    • binary
    ./images/css/mark.png
    • binary
    ./images/css/my-grades.png
    • -0
    • +38
    ./lamscommunity/community.jsp
    • -17
    • +54
    ./lamscommunity/lamscommunityLogin.jsp
  1. … 20 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. … 154 more files in changeset.
remove merge conflict flags

Merge lams2_3 into head

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

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