Merge AnnotatedUrl- an iframe tool to trunk

Description

Annotated Url (sakai.iframe.annotatedurl) is another type of iframe tool developed at University of Michigan. A snapshot of it attached (Picture 1). The tool has a link to a target url which is configured as a tool property (Picture 3). The text can be changed under options (Picture 2).

This was developed for sakai-2.5. This needs to be merged into trunk (2.9-SNAPSHOT)

Environment

None

Test Plan

None

Attachments

4

Activity

Show:

Anthony Whyte July 29, 2011 at 12:02 PM

Zhen resolved the 2.7.x conflicts manually. 2.7.x r95921 (r83808, r83809 and r83966).

Hudson CI Server November 1, 2010 at 10:09 PM

Anthony Whyte November 1, 2010 at 9:34 AM

2.8.x, r83986.

Savitha Prakash November 1, 2010 at 4:25 AM

Thanks for pointing it out David.

Resolved
r83966

David Horwitz November 1, 2010 at 2:54 AM

A debug line got included in this merge:

83808 savithap@umich.edu Hello3

Fixed

Details

Assignee

Reporter

Components

Fix versions

Affects versions

Priority

Created October 26, 2010 at 6:01 AM
Updated July 29, 2011 at 12:05 PM
Resolved November 1, 2010 at 4:25 AM