[sakai] svn commit: r59760 - in msub/iu.edu/oncourse/branches/roster_2-6-x: roster-api/src/java/org/sakaiproject/api/app/roster roster-app/src/bundle/org/sakaiproject/tool/roster/bundle roster-app/src/java/org/sakaiproject/tool/roster roster-app/src/webapp/css roster-app/src/webapp/js roster-app/src/webapp/roster roster-app/src/webapp/roster/inc roster-impl/src/java/org/sakaiproject/component/app/roster

wagnermr at iupui.edu wagnermr at iupui.edu
Mon Apr 6 14:32:35 PDT 2009 

Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=59760

Author: wagnermr at iupui.edu
Date: 2009-04-06 17:32:33 -0400 (Mon, 06 Apr 2009)
New Revision: 59760

Added:
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-app/src/webapp/js/print.js
Modified:
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-api/src/java/org/sakaiproject/api/app/roster/Participant.java
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-api/src/java/org/sakaiproject/api/app/roster/RosterManager.java
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-app/src/bundle/org/sakaiproject/tool/roster/bundle/Messages.properties
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-app/src/java/org/sakaiproject/tool/roster/BaseRosterPageBean.java
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-app/src/java/org/sakaiproject/tool/roster/EnrolledParticipant.java
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-app/src/java/org/sakaiproject/tool/roster/FilteredParticipantListingBean.java
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-app/src/java/org/sakaiproject/tool/roster/FilteredStatusListingBean.java
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-app/src/java/org/sakaiproject/tool/roster/RosterGroupMembership.java
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-app/src/java/org/sakaiproject/tool/roster/RosterOverview.java
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-app/src/webapp/css/roster.css
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-app/src/webapp/roster/groupMembership.jsp
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-app/src/webapp/roster/inc/nav.jspf
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-app/src/webapp/roster/printFriendly.jsp
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-impl/src/java/org/sakaiproject/component/app/roster/ParticipantImpl.java
   msub/iu.edu/oncourse/branches/roster_2-6-x/roster-impl/src/java/org/sakaiproject/component/app/roster/RosterManagerImpl.java
Log:
svn merge -c55234 https://source.sakaiproject.org/svn/oncourse/branches/roster_2-5-x
--- Merging r55234 into '.':
U    roster-app/src/webapp/roster/pictures.jsp
------------------------------------------------------------------------
r55234 | gjthomas at iupui.edu | 2008-12-12 11:35:08 -0500 (Fri, 12 Dec 2008) | 1 line

SAK-15072 - merge into oncourse
------------------------------------------------------------------------


svn merge -r55234:57225 https://source.sakaiproject.org/svn/oncourse/branches/roster_2-5-x
--- Merging r55235 through r57225 into '.':
U    roster-api/src/java/org/sakaiproject/api/app/roster/RosterManager.java
C    roster-api/src/java/org/sakaiproject/api/app/roster/Participant.java
C    roster-app/src/java/org/sakaiproject/tool/roster/EnrolledParticipant.java
U    roster-app/src/java/org/sakaiproject/tool/roster/RosterOverview.java
U    roster-app/src/java/org/sakaiproject/tool/roster/RosterGroupMembership.java
U    roster-app/src/java/org/sakaiproject/tool/roster/FilteredParticipantListingBean.java
U    roster-app/src/java/org/sakaiproject/tool/roster/FilteredStatusListingBean.java
U    roster-app/src/java/org/sakaiproject/tool/roster/BaseRosterPageBean.java
U    roster-app/src/bundle/org/sakaiproject/tool/roster/bundle/Messages.properties
U    roster-app/src/webapp/css/roster.css
A    roster-app/src/webapp/js/print.js
U    roster-app/src/webapp/roster/groupMembership.jsp
U    roster-app/src/webapp/roster/printFriendly.jsp
U    roster-app/src/webapp/roster/inc/nav.jspf
C    roster-impl/src/java/org/sakaiproject/component/app/roster/ParticipantImpl.java
C    roster-impl/src/java/org/sakaiproject/component/app/roster/RosterManagerImpl.java
------------------------------------------------------------------------
r55234 | gjthomas at iupui.edu | 2008-12-12 11:35:08 -0500 (Fri, 12 Dec 2008) | 1 line

SAK-15072 - merge into oncourse
------------------------------------------------------------------------
r55248 | gjthomas at iupui.edu | 2008-12-12 14:56:52 -0500 (Fri, 12 Dec 2008) | 1 line

SAK-15107 - oncourse merge
------------------------------------------------------------------------
r55312 | gjthomas at iupui.edu | 2008-12-15 15:00:19 -0500 (Mon, 15 Dec 2008) | 1 line

SAK-15109 - oncourse.  Will merge changes back into the sakai branch
------------------------------------------------------------------------
r55860 | gjthomas at iupui.edu | 2009-01-08 10:55:00 -0500 (Thu, 08 Jan 2009) | 1 line

ONC-674
------------------------------------------------------------------------
r56064 | gjthomas at iupui.edu | 2009-01-12 12:29:12 -0500 (Mon, 12 Jan 2009) | 1 line

SAK-15207 - oncourse merge
------------------------------------------------------------------------
r56104 | gjthomas at iupui.edu | 2009-01-13 08:57:02 -0500 (Tue, 13 Jan 2009) | 1 line

SAK-15358 - oncourse merge
------------------------------------------------------------------------
r56218 | gjthomas at iupui.edu | 2009-01-15 12:17:07 -0500 (Thu, 15 Jan 2009) | 1 line

SAK-15198 - oncourse merge
------------------------------------------------------------------------
r56446 | gjthomas at iupui.edu | 2009-01-21 15:48:18 -0500 (Wed, 21 Jan 2009) | 1 line

SAK-15070 - oncourse merge
------------------------------------------------------------------------
r56618 | gjthomas at iupui.edu | 2009-01-23 14:17:09 -0500 (Fri, 23 Jan 2009) | 1 line

SAK-15238 - oncourse merge
------------------------------------------------------------------------
r56622 | gjthomas at iupui.edu | 2009-01-23 15:24:29 -0500 (Fri, 23 Jan 2009) | 1 line

SAK-15241 - oncourse merge
------------------------------------------------------------------------
r57193 | gjthomas at iupui.edu | 2009-02-03 17:10:13 -0500 (Tue, 03 Feb 2009) | 1 line

SAK-15070 - Oncourse merge - Fixed an issue where it was not working with IE7 in XP
------------------------------------------------------------------------
r57225 | gjthomas at iupui.edu | 2009-02-04 14:40:45 -0500 (Wed, 04 Feb 2009) | 1 line

SAK-15238 - Oncourse merge
------------------------------------------------------------------------

More information about the source mailing list