• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2672 Ability for integrated servers to access learning design's SVGs

*merge from lams2_3_release branch

  1. … 5 more files in changeset.
file LearningDesignSVGServlet.java was initially added on branch lams2_3_release.

    • -0
    • +0
    ./lams/webservice/LearningDesignSVGServlet.java
LDEV-2672 Ability for integrated servers to access learning design's SVGs

  1. … 5 more files in changeset.
LDEV-2670: LAMS doesn't redirect when using https

  1. … 1 more file in changeset.
LDEV-2670: LAMS doesn't redirect when using https

  1. … 1 more file in changeset.
LDEV-2665 Ability to upload user's portrait directly from the webcam

*merge from lams2_3_release

    • -13
    • +71
    ./lams/web/PortraitSaveAction.java
  1. … 22 more files in changeset.
LDEV-2646: Several fixes for Planner access control:

"Viewing" and "removing" is for whole nodes, not just templates.

Node's owner can not remove it if there are subnodes he doesn't have permissions to remove.

    • -25
    • +63
    ./lams/web/planner/PedagogicalPlannerAction.java
  1. … 3 more files in changeset.
LDEV-2665 added ability to upload user's portrait directly from the webcam

    • -13
    • +71
    ./lams/web/PortraitSaveAction.java
  1. … 4 more files in changeset.
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.

    • -91
    • +127
    ./lams/web/planner/PedagogicalPlannerAction.java
    • -11
    • +142
    ./lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
  1. … 10 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.

    • -26
    • +47
    ./lams/web/planner/PedagogicalPlannerAction.java
  1. … 19 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.

    • -199
    • +218
    ./lams/web/planner/PedagogicalPlannerAction.java
  1. … 16 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

    • -0
    • +7
    ./lams/webservice/LearningDesignRepositorySoapBindingImpl.java
LDEV-2637 Show public folder when creating a lesson

    • -0
    • +7
    ./lams/webservice/LearningDesignRepositorySoapBindingImpl.java
LDEV-2614: Added expand activity button.

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

    • -27
    • +86
    ./lams/web/planner/PedagogicalPlannerAction.java
  1. … 7 more files in changeset.
LDEV-2615: Added button and code allowing editing a single activity in Full Author.

    • -14
    • +18
    ./lams/web/planner/PedagogicalPlannerAction.java
  1. … 4 more files in changeset.
LDEV-2599 fixing upload of files with UTF-8 filenames

LDEV-2599 FCKEditor connector are being able to handle utf-8 filenames for uploads

  1. … 1 more file in changeset.
LDEV-2548 Ability for a course manager to see *all* lessons...

*merge from lams2_3_release

  1. … 6 more files in changeset.
LDEV-2548 Ability for a course manager to see *all* lessons...

  1. … 8 more files in changeset.
LDEV-2573 subFolders within the Public Folders are going to be public as well

*merge from lams2_3_release

LDEV-2573 subFolders within the Public Folders are going to be public as well

LDEV-2089 Email messaging

*Merge from HEAD

  1. … 12 more files in changeset.
LDEV-2580 fixed Forgot your password feature when configuration setting SMTP is blank

*merge from HEAD

LDEV-2509 Embedded SMTP server

*Merge from HEAD

  1. … 17 more files in changeset.
LDEV-2580 fixed Forgot your password feature when configuration setting SMTP is blank

LDEV-2567: mergin to head