[sakai] svn commit: r77254 - in msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2: bundle impl/src/java/org/sakaiproject/assignment2/taggable/impl tool/src/java/org/sakaiproject/assignment2/tool tool/src/java/org/sakaiproject/assignment2/tool/entity tool/src/java/org/sakaiproject/assignment2/tool/params tool/src/java/org/sakaiproject/assignment2/tool/producers tool/src/java/org/sakaiproject/assignment2/tool/producers/renderers tool/src/webapp/WEB-INF tool/src/webapp/component-templates tool/src/webapp/content/templates
wagnermr at iupui.edu
wagnermr at iupui.edu
Fri May 7 08:39:41 PDT 2010
Details: http://source.sakaiproject.org/viewsvn?root=svn&view=rev&rev=77254
Author: wagnermr at iupui.edu
Date: 2010-05-07 11:39:41 -0400 (Fri, 07 May 2010)
New Revision: 77254
Added:
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/java/org/sakaiproject/assignment2/tool/entity/ViewAssignment2EntityProvider.java
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/java/org/sakaiproject/assignment2/tool/entity/ViewSubmissionEntityProvider.java
Modified:
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/bundle/messages.properties
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/impl/src/java/org/sakaiproject/assignment2/taggable/impl/AssignmentActivityImpl.java
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/impl/src/java/org/sakaiproject/assignment2/taggable/impl/AssignmentItemImpl.java
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/java/org/sakaiproject/assignment2/tool/LocalPermissionLogic.java
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/java/org/sakaiproject/assignment2/tool/params/AssignmentDetailsViewParams.java
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/java/org/sakaiproject/assignment2/tool/params/SimpleAssignmentViewParams.java
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/java/org/sakaiproject/assignment2/tool/params/ViewSubmissionParams.java
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/java/org/sakaiproject/assignment2/tool/producers/LayoutProducer.java
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/java/org/sakaiproject/assignment2/tool/producers/ViewAssignmentProducer.java
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/java/org/sakaiproject/assignment2/tool/producers/ViewStudentSubmissionProducer.java
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/java/org/sakaiproject/assignment2/tool/producers/renderers/AsnnDetailsRenderer.java
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/java/org/sakaiproject/assignment2/tool/producers/renderers/AsnnSubmitEditorRenderer.java
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/java/org/sakaiproject/assignment2/tool/producers/renderers/StudentViewAssignmentRenderer.java
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/webapp/WEB-INF/applicationContext.xml
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/webapp/WEB-INF/requestContext.xml
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/webapp/component-templates/AsnnDetails.html
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/webapp/component-templates/StudentViewAssignment.html
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/webapp/content/templates/view-assignment.html
msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/assignment2/tool/src/webapp/content/templates/view-submission.html
Log:
svn merge -c77253 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/assignment2
--- Merging r77253 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
------------------------------------------------------------------------
r77253 | wagnermr at iupui.edu | 2010-05-07 11:35:36 -0400 (Fri, 07 May 2010) | 25 lines
NOJIRA - update to r67592 tag
svn merge https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/vendor/assignment2/assignment2_2-6-x/assignment2_2-6-x_r67479/ https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/vendor/assignment2/assignment2_2-6-x/current/ .
--- Merging differences between repository URLs 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
------------------------------------------------------------------------
More information about the source
mailing list