Fri May 7 08:05:37 PDT 2010

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

Author: wagnermr at iupui.edu
Date: 2010-05-07 11:05:37 -0400 (Fri, 07 May 2010)
New Revision: 67592

Added:
   assignment2/branches/sakai_2-6-x/tool/src/java/org/sakaiproject/assignment2/tool/entity/ViewAssignment2EntityProvider.java
   assignment2/branches/sakai_2-6-x/tool/src/java/org/sakaiproject/assignment2/tool/entity/ViewSubmissionEntityProvider.java
Modified:
   assignment2/branches/sakai_2-6-x/bundle/messages.properties
   assignment2/branches/sakai_2-6-x/impl/src/java/org/sakaiproject/assignment2/taggable/impl/AssignmentActivityImpl.java
   assignment2/branches/sakai_2-6-x/impl/src/java/org/sakaiproject/assignment2/taggable/impl/AssignmentItemImpl.java
   assignment2/branches/sakai_2-6-x/tool/src/java/org/sakaiproject/assignment2/tool/LocalPermissionLogic.java
   assignment2/branches/sakai_2-6-x/tool/src/java/org/sakaiproject/assignment2/tool/params/AssignmentDetailsViewParams.java
   assignment2/branches/sakai_2-6-x/tool/src/java/org/sakaiproject/assignment2/tool/params/SimpleAssignmentViewParams.java
   assignment2/branches/sakai_2-6-x/tool/src/java/org/sakaiproject/assignment2/tool/params/ViewSubmissionParams.java
   assignment2/branches/sakai_2-6-x/tool/src/java/org/sakaiproject/assignment2/tool/producers/LayoutProducer.java
   assignment2/branches/sakai_2-6-x/tool/src/java/org/sakaiproject/assignment2/tool/producers/ViewAssignmentProducer.java
   assignment2/branches/sakai_2-6-x/tool/src/java/org/sakaiproject/assignment2/tool/producers/ViewStudentSubmissionProducer.java
   assignment2/branches/sakai_2-6-x/tool/src/java/org/sakaiproject/assignment2/tool/producers/renderers/AsnnDetailsRenderer.java
   assignment2/branches/sakai_2-6-x/tool/src/java/org/sakaiproject/assignment2/tool/producers/renderers/AsnnSubmitEditorRenderer.java
   assignment2/branches/sakai_2-6-x/tool/src/java/org/sakaiproject/assignment2/tool/producers/renderers/StudentViewAssignmentRenderer.java
   assignment2/branches/sakai_2-6-x/tool/src/webapp/WEB-INF/applicationContext.xml
   assignment2/branches/sakai_2-6-x/tool/src/webapp/WEB-INF/requestContext.xml
   assignment2/branches/sakai_2-6-x/tool/src/webapp/component-templates/AsnnDetails.html
   assignment2/branches/sakai_2-6-x/tool/src/webapp/component-templates/StudentViewAssignment.html
   assignment2/branches/sakai_2-6-x/tool/src/webapp/content/templates/view-assignment.html
   assignment2/branches/sakai_2-6-x/tool/src/webapp/content/templates/view-submission.html
Log:
Update 2.6.x to r67576
svn merge -r67511:67576 https://source.sakaiproject.org/contrib/assignment2/trunk
--- Merging r67512 through r67576 into '.':
U    impl/src/java/org/sakaiproject/assignment2/taggable/impl/AssignmentActivityImpl.java
U    impl/src/java/org/sakaiproject/assignment2/taggable/impl/AssignmentItemImpl.java
U    bundle/messages.properties
U    tool/src/java/org/sakaiproject/assignment2/tool/params/AssignmentDetailsViewParams.java
U    tool/src/java/org/sakaiproject/assignment2/tool/params/SimpleAssignmentViewParams.java
U    tool/src/java/org/sakaiproject/assignment2/tool/params/ViewSubmissionParams.java
U    tool/src/java/org/sakaiproject/assignment2/tool/LocalPermissionLogic.java
U    tool/src/java/org/sakaiproject/assignment2/tool/producers/ViewStudentSubmissionProducer.java
U    tool/src/java/org/sakaiproject/assignment2/tool/producers/ViewAssignmentProducer.java
U    tool/src/java/org/sakaiproject/assignment2/tool/producers/renderers/AsnnSubmitEditorRenderer.java
U    tool/src/java/org/sakaiproject/assignment2/tool/producers/renderers/StudentViewAssignmentRenderer.java
U    tool/src/java/org/sakaiproject/assignment2/tool/producers/renderers/AsnnDetailsRenderer.java
U    tool/src/java/org/sakaiproject/assignment2/tool/producers/LayoutProducer.java
A    tool/src/java/org/sakaiproject/assignment2/tool/entity/ViewAssignment2EntityProvider.java
A    tool/src/java/org/sakaiproject/assignment2/tool/entity/ViewSubmissionEntityProvider.java
U    tool/src/webapp/WEB-INF/applicationContext.xml
U    tool/src/webapp/WEB-INF/requestContext.xml
U    tool/src/webapp/content/templates/view-assignment.html
U    tool/src/webapp/content/templates/view-submission.html
U    tool/src/webapp/component-templates/AsnnDetails.html
U    tool/src/webapp/component-templates/StudentViewAssignment.html
------------------------------------------------------------------------
r67512 | gjthomas at iupui.edu | 2010-05-05 13:30:50 -0400 (Wed, 05 May 2010) | 1 line

ASNN-669 - In A2, discrepancies with design doc for Preview as Student (PS-1)
------------------------------------------------------------------------
r67549 | wagnermr at iupui.edu | 2010-05-06 11:23:23 -0400 (Thu, 06 May 2010) | 2 lines

ASNN-670
Make the view assignment and view submission screens accessible via entity urls
------------------------------------------------------------------------
r67576 | wagnermr at iupui.edu | 2010-05-06 16:51:00 -0400 (Thu, 06 May 2010) | 2 lines

ASNN-671
Error if user in Assignment2 attempts to view details for graded assignment but does not have permission in Gradebook
------------------------------------------------------------------------