Skip to end of metadata
Go to start of metadata

You are viewing an old version of this page. View the current version.

Compare with Current View Page History

Version 1 Next » 

psl-247 : ~/src/sakai-trunk-ucd/gradebook/ # svn merge -r 4488:4481 .
U    .classpath
U    app/sakai-tool/src/webapp/WEB-INF/spring-facades.xml
G    app/sakai-tool/src/webapp/WEB-INF/web.xml
U    app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java
D    app/ui/src/java/edu/ucdavis/smartsite/gradebook/converter/FinalGradingToolDataFileWriterCsv.java
D    app/ui/src/java/edu/ucdavis/smartsite/gradebook/converter
D    app/ui/src/java/edu/ucdavis/smartsite/gradebook
D    app/ui/src/java/edu/ucdavis/smartsite
D    app/ui/src/java/edu/ucdavis
D    app/ui/src/java/edu
D    app/ui/src/java/org/sakaiproject/tool/gradebook/ui/ScantronImportHelper.java
U    app/ui/src/java/org/sakaiproject/tool/gradebook/ui/CourseGradeDetailsBean.java
C    app/ui/src/java/org/sakaiproject/tool/gradebook/ui/GradebookDependentBean.java
U    app/ui/src/java/org/sakaiproject/tool/gradebook/ui/EnrollmentTableBean.java
U    app/ui/src/java/org/sakaiproject/tool/gradebook/ui/SpreadsheetUploadBean.java
U    app/ui/src/bundle/org/sakaiproject/tool/gradebook/bundle/Messages.properties
U    app/ui/src/webapp/courseGradeDetails.jsp
U    app/ui/src/webapp/spreadsheetUpload.jsp
U    app/ui/pom.xml

psl-247 : ~/src/sakai-trunk-ucd/gradebook/ # svn commit -m "NOJIRA : After discussing GB changes with Jon, we are merging out all the ucd specific gradebook changes and kinda start over. At least check if our modifications are still needed, except the final grade submission code which we will apply again : svn merge -r 4488:4481 ."
Sending        .classpath
Sending        app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java
Sending        app/sakai-tool/src/webapp/WEB-INF/spring-facades.xml
Sending        app/sakai-tool/src/webapp/WEB-INF/web.xml
Sending        app/ui/pom.xml
Sending        app/ui/src/bundle/org/sakaiproject/tool/gradebook/bundle/Messages.properties
Deleting       app/ui/src/java/edu
Sending        app/ui/src/java/org/sakaiproject/tool/gradebook/ui/CourseGradeDetailsBean.java
Sending        app/ui/src/java/org/sakaiproject/tool/gradebook/ui/EnrollmentTableBean.java
Sending        app/ui/src/java/org/sakaiproject/tool/gradebook/ui/GradebookDependentBean.java
Deleting       app/ui/src/java/org/sakaiproject/tool/gradebook/ui/ScantronImportHelper.java
Sending        app/ui/src/java/org/sakaiproject/tool/gradebook/ui/SpreadsheetUploadBean.java
Sending        app/ui/src/webapp/courseGradeDetails.jsp
Sending        app/ui/src/webapp/spreadsheetUpload.jsp
Transmitting file data ............
Committed revision 4646.
  • No labels