[contrib] svn commit: r78678 - in columbia/delegatedaccess/branches/trunk_2-8-x-COLUMBIA: . api/src/java/org/sakaiproject/delegatedaccess/logic api/src/java/org/sakaiproject/delegatedaccess/model impl/src/java/org/sakaiproject/delegatedaccess/logic tool/src/java/org/sakaiproject/delegatedaccess/tool/pages tool/src/webapp tool/src/webapp/images

[slt at columbia.edu]

Details: http://source.sakaiproject.org/viewsvn?root=contrib&view=rev&rev=78678

Author: slt at columbia.edu
Date: 2012-03-06 10:12:56 -0500 (Tue, 06 Mar 2012)
New Revision: 78678

Added:
   columbia/delegatedaccess/branches/trunk_2-8-x-COLUMBIA/tool/src/webapp/images/
   columbia/delegatedaccess/branches/trunk_2-8-x-COLUMBIA/tool/src/webapp/images/loading.gif
Removed:
   columbia/delegatedaccess/branches/trunk_2-8-x-COLUMBIA/tool/src/webapp/images/loading.gif
Modified:
   columbia/delegatedaccess/branches/trunk_2-8-x-COLUMBIA/
   columbia/delegatedaccess/branches/trunk_2-8-x-COLUMBIA/api/src/java/org/sakaiproject/delegatedaccess/logic/ProjectLogic.java
   columbia/delegatedaccess/branches/trunk_2-8-x-COLUMBIA/api/src/java/org/sakaiproject/delegatedaccess/model/NodeModel.java
   columbia/delegatedaccess/branches/trunk_2-8-x-COLUMBIA/impl/src/java/org/sakaiproject/delegatedaccess/logic/DelegatedAccessObserver.java
   columbia/delegatedaccess/branches/trunk_2-8-x-COLUMBIA/impl/src/java/org/sakaiproject/delegatedaccess/logic/ProjectLogicImpl.java
   columbia/delegatedaccess/branches/trunk_2-8-x-COLUMBIA/tool/src/java/org/sakaiproject/delegatedaccess/tool/pages/BasePage.html
   columbia/delegatedaccess/branches/trunk_2-8-x-COLUMBIA/tool/src/java/org/sakaiproject/delegatedaccess/tool/pages/ShoppingEditPage.html
   columbia/delegatedaccess/branches/trunk_2-8-x-COLUMBIA/tool/src/java/org/sakaiproject/delegatedaccess/tool/pages/ShoppingEditPage.java
   columbia/delegatedaccess/branches/trunk_2-8-x-COLUMBIA/tool/src/java/org/sakaiproject/delegatedaccess/tool/pages/UserEditPage.java
   columbia/delegatedaccess/branches/trunk_2-8-x-COLUMBIA/tool/src/java/org/sakaiproject/delegatedaccess/tool/pages/UserPage.java
Log:
merge delegatedaccess trunk r78515 r78550 r78555 r78614 r78655 (bug 25435)