• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
file ui-bg_glass_65_ffffff_1x400.png was initially added on branch lams2_3_release.

LDEV-2642, LDEV-2646: Extend access control for Planner nodes.

Add a node's owner field.

Fix exporting/importing nodes.

Upgrade XStream from 1.1 to 1.1.3.

  1. … 9 more files in changeset.
LDEV-2628 *introduced new class which maps lessons with integration server

*merge from lams2_3_release

  1. … 8 more files in changeset.
LDEV-2646: Allow access control for viewing/editing a copy/original template in Planner nodes for Teachers.

Swap collapse/expand arrows - it seems more right now.

Some clean up - move PlannerActivityMetadata to a proper packet, change some labels etc.

    • binary
    ./web/images/pedag_collapse_arrow.png
    • binary
    ./web/images/pedag_expand_arrow.png
  1. … 14 more files in changeset.
LDEV-2642, LDEV-2616:

Move Planner activity metadata (hidden, collapsed, expanded) to a separate table, as it may grow in the future and we don't want to make ToolActivity too complex.

Move Editing Advice content from Online Instructions in activities to the metadata table.

Allow editing the Editing Advice straight from the planner. Use jquery_ui instead of cluetip (dispose the last one completely).

While creating a node, the Learning Design is imported just once from ZIP into DB, instead of importing it each time someone opens it in Planner. This allows less unnecessary copies of the LD and allows easier modfication of the original design.

Change the way a Teacher gets a copy of the design. When opening the template in Planner, a copy is made in common folder ("Planner preview"). When the user saves the design, the same copy is *moved* to user's folder, rather than copying it again. Futhermore, each subsequent save modifies the same LD rather than making another copy.

  1. … 12 more files in changeset.
LDEV-2628 *introduced new class which maps lessons with integration server

  1. … 8 more files in changeset.
LDEV-2637 Show public folder when creating a lesson

*merge from lams2_3_release

LDEV-2637 Show public folder when creating a lesson

LDEV-2637 Show public folder when creating a lesson

*merge from lams2_3_release

LDEV-2637 Show public folder when creating a lesson

LDEV-2598: Updating Greek

LDEV-2577: Upgraded jQuery Form plugin to the latest version which fixed a bug in file uploading - previously impacting Shared Resources in Planner.

The new version is compatible with jQuery 1.3.2 which LAMS currently is using and should be backwards compatible, but it has not been tested in other projects than lams_central - sorry!

    • -485
    • +644
    ./web/includes/javascript/jquery.form.js
  1. … 2 more files in changeset.
LDEV-2577: Fixed a bug preventing multiple CKEditor instances on one page to be properly reinitialized after form submit.

  1. … 27 more files in changeset.
LDEV-2614: Added expand activity button.

Collapse/expand activity state is now stored on "Save as Sequence" action.

    • binary
    ./web/images/pedag_expand.png
  1. … 4 more files in changeset.
LDEV-2577: Added extra safety measure preventing plain textarea from being show instead of CKEditor instance.

  1. … 27 more files in changeset.
LDEV-2615: Added button and code allowing editing a single activity in Full Author.

  1. … 1 more file in changeset.
LDEV-2614: Finding items to hide using common class, rather than id.

LDEV-2614: Added a button to collapse an activity and hyperlink to expand it.

    • binary
    ./web/images/pedag_collapse.png
LDEV-2598: Updating Greek, Swedish

  1. … 12 more files in changeset.
LDEV-2598: Updating Norwegian

LDEV-2607: Hardcoded CKEditor width as a fix for Chrome inability to process "100%" width correctly.

  1. … 26 more files in changeset.
LDEV-2577: Readded movieplayer plugin for CKEditor 3.x

    • -0
    • +25
    ./web/ckeditor/plugins/movieplayer/LICENSE.TXT
    • binary
    ./web/ckeditor/plugins/movieplayer/filmreel.gif
    • binary
    ./web/ckeditor/plugins/movieplayer/filmreel.png
    • -0
    • +1
    ./web/ckeditor/plugins/movieplayer/movieplayer.html
    • -0
    • +1
    ./web/ckeditor/plugins/movieplayer/movieplayer.js
    • binary
    ./web/ckeditor/plugins/movieplayer/player_flv_maxi.swf
    • binary
    ./web/ckeditor/plugins/movieplayer/player_mp3_maxi.swf
    • -0
    • +5
    ./web/ckeditor/plugins/movieplayer/plugin.js
    • -0
    • +13
    ./web/ckeditor/plugins/movieplayer/lang/en.js
LDEV-2577: Set default height for CKEditor instances, as in IE it was minimal.

  1. … 27 more files in changeset.
LDEV-2595: As CSS parameter "display: none" does not work in IE, the initial textarea for CKEditor has height = 0px which does the trick instead.

  1. … 27 more files in changeset.
LDEV-2603 adding tool's images that will be used for SVG creation

*merging from lams2_3_release

    • binary
    ./web/images/svg/icon_assessment.png
    • binary
    ./web/images/svg/icon_branching.png
    • binary
    ./web/images/svg/icon_dotLRNForum.png
    • binary
    ./web/images/svg/icon_eAdventure2.png
    • binary
    ./web/images/svg/icon_forum_and_scribe.png
    • binary
    ./web/images/svg/icon_groupreporting.png
    • binary
    ./web/images/svg/icon_imageGallery.png
  1. … 16 more files in changeset.
file icon_eAdventure2.png was initially added on branch lams2_3_release.

    • binary
    ./web/images/svg/icon_eAdventure2.png
file icon_ranking.png was initially added on branch lams2_3_release.

    • binary
    ./web/images/svg/icon_ranking.png
file icon_forum_and_scribe.png was initially added on branch lams2_3_release.

    • binary
    ./web/images/svg/icon_forum_and_scribe.png
file icon_reportsubmission.png was initially added on branch lams2_3_release.

    • binary
    ./web/images/svg/icon_reportsubmission.png
file icon_mindmap.png was initially added on branch lams2_3_release.

    • binary
    ./web/images/svg/icon_mindmap.png