[sakai] svn commit: r76085 - in gradebook/branches/sakai-2.7.x/app/ui/src: bundle/org/sakaiproject/tool/gradebook/bundle java/org/sakaiproject/tool/gradebook/ui webapp

[wagnermr at iupui.edu]

Details: http://source.sakaiproject.org/viewsvn?root=svn&view=rev&rev=76085

Author: wagnermr at iupui.edu
Date: 2010-04-12 08:57:21 -0400 (Mon, 12 Apr 2010)
New Revision: 76085

Modified:
   gradebook/branches/sakai-2.7.x/app/ui/src/bundle/org/sakaiproject/tool/gradebook/bundle/Messages.properties
   gradebook/branches/sakai-2.7.x/app/ui/src/bundle/org/sakaiproject/tool/gradebook/bundle/Messages_es.properties
   gradebook/branches/sakai-2.7.x/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java
   gradebook/branches/sakai-2.7.x/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/SpreadsheetUploadBean.java
   gradebook/branches/sakai-2.7.x/app/ui/src/webapp/courseGradeDetails.jsp
   gradebook/branches/sakai-2.7.x/app/ui/src/webapp/roster.jsp
   gradebook/branches/sakai-2.7.x/app/ui/src/webapp/spreadsheetEntireGBImport.jsp
Log:
svn merge -c74777 https://source.sakaiproject.org/svn/gradebook/trunk
--- Merging r74777 into '.':
U    app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java
U    app/ui/src/java/org/sakaiproject/tool/gradebook/ui/SpreadsheetUploadBean.java
U    app/ui/src/bundle/org/sakaiproject/tool/gradebook/bundle/Messages_es.properties
Conflict discovered in 'app/ui/src/bundle/org/sakaiproject/tool/gradebook/bundle/Messages.properties'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C    app/ui/src/bundle/org/sakaiproject/tool/gradebook/bundle/Messages.properties
U    app/ui/src/webapp/courseGradeDetails.jsp
U    app/ui/src/webapp/roster.jsp
U    app/ui/src/webapp/spreadsheetEntireGBImport.jsp
------------------------------------------------------------------------
r74777 | wagnermr at iupui.edu | 2010-03-18 10:45:39 -0400 (Thu, 18 Mar 2010) | 2 lines

SAK-15480
Unable to export Gradebook with UTF-8 character names
------------------------------------------------------------------------
svn merge -c75124 https://source.sakaiproject.org/svn/gradebook/trunk
--- Merging r75124 into '.':
G    app/ui/src/bundle/org/sakaiproject/tool/gradebook/bundle/Messages.properties
G    app/ui/src/webapp/spreadsheetEntireGBImport.jsp
------------------------------------------------------------------------
r75124 | wagnermr at iupui.edu | 2010-03-24 09:22:10 -0400 (Wed, 24 Mar 2010) | 3 lines

SAK-15480
Unable to export Gradebook with UTF-8 character names
Fix some text referring to csv that was missed
------------------------------------------------------------------------