Versions Compared

Old Version 2

changes.mady.by.user Jon Gorrono

Saved on

compared with

New Version 3

changes.mady.by.user Thomas Amsler

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Section
Column

Module Name: access

Module Name: alias

  • none

Module Name: announcement

  • none

Module Name: archive

  • none

Module Name: assignment

none

Module Name: authz

  • none

Module Name: blog

  • none

Module Name: calendar

  • none

Module Name: chat

  • none

Module Name: citations

  • none

Module Name: cluster

  • none

Module Name: component

  • none

Module Name: content

Module Name: content-review

  • none

Module Name: courier

  • none

Module Name: course-management

  • none

Module Name: dav

Module Name: db

  • none

Module Name: discussion

  • none

Module Name: email

  • none

Module Name: entity

  • none

Module Name: event

  • none

Module Name: gradebook

  • none

Module Name: help

  • none

Module Name: jobscheduler

  • none

Module Name: jsf

Module Name: linktool

  • none

Module Name: login

  • none

Module Name: mailarchive

  • none

Module Name: mailtool

  • none

Module Name: master

  • none

Module Name: memory

  • none

Module Name: message

  • none

Module Name: metaobj

Module Name: msgcntr

none

Module Name: osid

  • none

Module Name: osp

  • SAK-4652 Descriptions of certain tools in Site info and Worksite Setup are terse

Module Name: podcasts

Module Name: podcasts

Module Name: polls

  • none

Module Name: portal

Module Name: postem

  • none

Module Name: presence

  • none

Module Name: presentation

  • none

Module Name: privacy

  • none

Module Name: profile

  • none

Module Name: providers

  • none

Module Name: reference

Module Name: rights

  • none

Module Name: roster

  • none

Module Name: rwiki

  • none

Module Name: sam

Module Name: samples

  • none

Module Name: search

  • none

Module Name: sections

  • none

Module Name: site

  • none

Module Name: site-manage

Module Name: syllabus

  • none

Module Name: test-harness

  • none

Module Name: textarea

  • none

Module Name: tool

  • none

Module Name: user

  • none

Module Name: util

Module Name: usermembership

  • none

Module Name: velocity

  • none

Module Name: web

  • none

Module Name: webservices

  • none
Column
Code Block
titleSVN Logs
borderStylesolid
------------------------------------------------------------------------


 alias/ 

------------------------------------------------------------------------


 announcement/ 

------------------------------------------------------------------------
r48544 | bkirschn@umich.edu | 2008-07-08 07:45:14 -0700 (Tue, 08 Jul 2008) | 1 line

SAK-12769 portuguese for 2.5.x
------------------------------------------------------------------------


 archive/ 

------------------------------------------------------------------------


 assignment/ 

------------------------------------------------------------------------
r48545 | bkirschn@umich.edu | 2008-07-08 07:45:15 -0700 (Tue, 08 Jul 2008) | 1 line

SAK-12769 portuguese for 2.5.x
------------------------------------------------------------------------
r48724 | david.horwitz@uct.ac.za | 2008-07-15 23:53:53 -0700 (Tue, 15 Jul 2008) | 17 lines

> svn log -r48254 https://source.sakaiproject.org/svn/assignment/trunk/
------------------------------------------------------------------------
r48254 | zqian@umich.edu | 2008-06-27 17:08:00 +0200 (Fri, 27 Jun 2008)
| 1 line

fix to SAK-13789:Assignments Disclosure of Information - multi tab
browsing
------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c48254 https://source.sakaiproject.org/svn/assignment/trunk/
assignment/
U    assignment/assignment-bundles/assignment.properties
U
assignment/assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
U
assignment/assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm

------------------------------------------------------------------------
r49134 | stephen.marquard@uct.ac.za | 2008-07-22 19:04:39 -0700 (Tue, 22 Jul 2008) | 1 line

NOJIRA Update help docs (synchronize with IU KB)
------------------------------------------------------------------------


 authz/ 



 blog/ 

------------------------------------------------------------------------


 calendar/ 

------------------------------------------------------------------------
r48546 | bkirschn@umich.edu | 2008-07-08 07:45:22 -0700 (Tue, 08 Jul 2008) | 1 line

SAK-12769 portuguese for 2.5.x
------------------------------------------------------------------------
r48745 | david.horwitz@uct.ac.za | 2008-07-16 08:26:56 -0700 (Wed, 16 Jul 2008) | 15 lines

svn log -r47400 https://source.sakaiproject.org/svn/calendar/trunk/
------------------------------------------------------------------------
r47400 | bkirschn@umich.edu | 2008-06-11 22:27:25 +0200 (Wed, 11 Jun
2008) | 1 line

SAK-5960 sort groups for event details
------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c47400 https://source.sakaiproject.org/svn/calendar/trunk/ calendar/
U
calendar/calendar-tool/tool/src/java/org/sakaiproject/calendar/tool/CalendarAction.java
U
calendar/calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/BaseCalendarService.java


------------------------------------------------------------------------
r49034 | stephen.marquard@uct.ac.za | 2008-07-18 19:01:47 -0700 (Fri, 18 Jul 2008) | 1 line

NOJIRA Update help docs (synchronize with IU KB)
------------------------------------------------------------------------
r50126 | stephen.marquard@uct.ac.za | 2008-08-05 06:28:06 -0700 (Tue, 05 Aug 2008) | 1 line

NOJIRA Update help docs (synchronize with IU KB)
------------------------------------------------------------------------


 chat/ 

------------------------------------------------------------------------


 citations/ 

------------------------------------------------------------------------


 cluster/ 

------------------------------------------------------------------------


 cm-ucd-impl/ 



 component/ 



 configuration/ 



 content/ 

------------------------------------------------------------------------
r48551 | bkirschn@umich.edu | 2008-07-08 07:45:34 -0700 (Tue, 08 Jul 2008) | 1 line

SAK-12769 portuguese for 2.5.x
------------------------------------------------------------------------
r48603 | stephen.marquard@uct.ac.za | 2008-07-09 19:02:13 -0700 (Wed, 09 Jul 2008) | 1 line

NOJIRA Update help docs (synchronize with IU KB)
------------------------------------------------------------------------
r48743 | david.horwitz@uct.ac.za | 2008-07-16 08:15:56 -0700 (Wed, 16 Jul 2008) | 12 lines

svn log -r47399 https://source.sakaiproject.org/svn/content/trunk/
------------------------------------------------------------------------
r47399 | bkirschn@umich.edu | 2008-06-11 22:23:09 +0200 (Wed, 11 Jun
2008) | 1 line

SAK-13721 sort groups for resource details
------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c47399 https://source.sakaiproject.org/svn/content/trunk/ content
U
content/content-tool/tool/src/java/org/sakaiproject/content/tool/ListItem.java

------------------------------------------------------------------------
r49135 | stephen.marquard@uct.ac.za | 2008-07-22 19:04:54 -0700 (Tue, 22 Jul 2008) | 1 line

NOJIRA Update help docs (synchronize with IU KB)
------------------------------------------------------------------------
r49140 | david.horwitz@uct.ac.za | 2008-07-23 02:10:03 -0700 (Wed, 23 Jul 2008) | 29 lines

vn log -r48539 https://source.sakaiproject.org/svn/content/trunk
------------------------------------------------------------------------
r48539 | ian@caret.cam.ac.uk | 2008-07-08 02:25:04 +0200 (Tue, 08 Jul
2008) | 10 lines

SAK-13919


Fixed

There is a unit test now to check.
The conversion utility serializer has been fixed
The runtime serializer is self healing.


------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c48539 https://source.sakaiproject.org/svn/content/trunk content
A
content/content-impl/impl/src/test/org/sakaiproject/content/impl/serialize/impl/test/SaxSerializerTest.java
U
content/content-impl/impl/src/java/org/sakaiproject/content/impl/serialize/impl/conversion/SAXSerializableCollectionAccess.java
U
content/content-impl/impl/src/java/org/sakaiproject/content/impl/serialize/impl/conversion/SAXSerializableResourceAccess.java
U
content/content-impl/impl/src/java/org/sakaiproject/content/impl/serialize/impl/Type1BaseContentResourceSerializer.java
U
content/content-impl/impl/src/java/org/sakaiproject/content/impl/serialize/impl/Type1BaseContentCollectionSerializer.java

------------------------------------------------------------------------
r49329 | david.horwitz@uct.ac.za | 2008-07-24 04:11:52 -0700 (Thu, 24 Jul 2008) | 3 lines

SAK-13827 applied patches content-runconversion20080622.patch  and
SAK-13827-2.5.x.patch to the branch

------------------------------------------------------------------------
r49939 | stephen.marquard@uct.ac.za | 2008-08-01 06:28:00 -0700 (Fri, 01 Aug 2008) | 1 line

NOJIRA Update help docs (synchronize with IU KB)
------------------------------------------------------------------------


 content-review/ 

------------------------------------------------------------------------
r48729 | david.horwitz@uct.ac.za | 2008-07-16 03:37:29 -0700 (Wed, 16 Jul 2008) | 21 lines

 svn merge -c47041
https://source.sakaiproject.org/svn/content-review/trunk/
content-review/
D
content-review/content-review-api/logic/src/java/org/sakaiproject/contentreview/dao/ContentReviewDao.java
U    content-review/content-review-api/logic/pom.xml
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn log -r47042
https://source.sakaiproject.org/svn/content-review/trunk/
------------------------------------------------------------------------
r47042 | david.horwitz@uct.ac.za | 2008-06-01 13:08:45 +0200 (Sun, 01
Jun 2008) | 2 lines

SAK-13613 remove the empty logic packages

------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c47042 https://source.sakaiproject.org/svn/content-review/trunk/
content-review/
Skipped 'content-review/content-review-api/logic'
U    content-review/pom.xml

------------------------------------------------------------------------
r48730 | david.horwitz@uct.ac.za | 2008-07-16 03:45:26 -0700 (Wed, 16 Jul 2008) | 23 lines

svn log -r47042
https://source.sakaiproject.org/svn/content-review/trunk/
------------------------------------------------------------------------
r47042 | david.horwitz@uct.ac.za | 2008-06-01 13:08:45 +0200 (Sun, 01
Jun 2008) | 2 lines

SAK-13613 remove the empty logic packages

------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c47042 https://source.sakaiproject.org/svn/content-review/trunk/
content-review/
D
content-review/content-review-api/logic/src/java/org/sakaiproject/contentreview/dao
D
content-review/content-review-api/logic/src/java/org/sakaiproject/contentreview
D    content-review/content-review-api/logic/src/java/org/sakaiproject
D    content-review/content-review-api/logic/src/java/org
D    content-review/content-review-api/logic/src/java
D    content-review/content-review-api/logic/src
D    content-review/content-review-api/logic/pom.xml
D    content-review/content-review-api/logic

------------------------------------------------------------------------
r48810 | david.horwitz@uct.ac.za | 2008-07-18 08:13:19 -0700 (Fri, 18 Jul 2008) | 14 lines

svn log -r48612
https://source.sakaiproject.org/svn/content-review/trunk/
------------------------------------------------------------------------
r48612 | david.horwitz@uct.ac.za | 2008-07-10 15:41:59 +0200 (Thu, 10
Jul 2008) | 1 line

SAK-13941 change long to Long
------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c48612 https://source.sakaiproject.org/svn/content-review/trunk/
content-review/
U
content-review/content-review-api/model/src/java/org/sakaiproject/contentreview/model/ContentReviewItem.java

------------------------------------------------------------------------
r49048 | david.horwitz@uct.ac.za | 2008-07-20 23:48:37 -0700 (Sun, 20 Jul 2008) | 14 lines

 svn log -r46669
https://source.sakaiproject.org/svn/content-review/trunk/
------------------------------------------------------------------------
r46669 | david.horwitz@uct.ac.za | 2008-05-23 12:05:22 +0200 (Fri, 23
May 2008) | 1 line

SAK-13603 add TransientSubmissionException
------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c46669 https://source.sakaiproject.org/svn/content-review/trunk/
content-review/
A
content-review/content-review-api/model/src/java/org/sakaiproject/contentreview/exception/TransientSubmissionException.java

------------------------------------------------------------------------
r50100 | david.horwitz@uct.ac.za | 2008-08-05 05:25:17 -0700 (Tue, 05 Aug 2008) | 1 line

NOJIRA remove missing src folder
------------------------------------------------------------------------


 courier/ 

------------------------------------------------------------------------


 course-management/ 



 dav/ 



 db/ 

------------------------------------------------------------------------
r49080 | csev@umich.edu | 2008-07-21 11:47:55 -0700 (Mon, 21 Jul 2008) | 11 lines

SAK-13886

Commit the support for DbFlatPropertiesCache to 2-5-x. 

This adds a new property.  The default is to :all:.

# DbFlatPropertiesCache=:SAKAI_SITE_PROPERTY:
# DbFlatPropertiesCache=:all:
DbFlatPropertiesCache=:none:


------------------------------------------------------------------------
r49329 | david.horwitz@uct.ac.za | 2008-07-24 04:11:52 -0700 (Thu, 24 Jul 2008) | 3 lines

SAK-13827 applied patches content-runconversion20080622.patch  and
SAK-13827-2.5.x.patch to the branch

------------------------------------------------------------------------
r49771 | david.horwitz@uct.ac.za | 2008-07-30 04:54:35 -0700 (Wed, 30 Jul 2008) | 22 lines

svn log -r49404 https://source.sakaiproject.org/svn/db/branches/pre-K1/
------------------------------------------------------------------------
r49404 | csev@umich.edu | 2008-07-26 04:19:19 +0200 (Sat, 26 Jul 2008) |
8 lines

SAK-14084
SAK-14079

Switch to using the MemoryService to build and retrieve the DbFlat
caches.

This should be merged into 2-5-x.


------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c49404 https://source.sakaiproject.org/svn/db/branches/pre-K1/ db
U
db/db-util/storage/src/java/org/sakaiproject/util/BaseDbFlatStorage.java
U    db/db-util/storage/pom.xml


------------------------------------------------------------------------
r49782 | david.horwitz@uct.ac.za | 2008-07-30 08:23:06 -0700 (Wed, 30 Jul 2008) | 56 lines

svn log -r49501 https://source.sakaiproject.org/svn/db/branches/pre-K1
------------------------------------------------------------------------
r49501 | aaronz@vt.edu | 2008-07-29 13:33:46 +0200 (Tue, 29 Jul 2008) |
3 lines

http://jira.sakaiproject.org/jira/browse/SAK-14079
Added in naming and added configurable cache beans as requested by
smarquard, tested to make sure the caches are being used
Fixed up the classpath that was broken
------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c49501 https://source.sakaiproject.org/svn/db/branches/pre-K1 db
U    db/db-impl/pack/src/webapp/WEB-INF/components.xml
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn log -r49502
https://source.sakaiproject.org/svn/db/branches/pre-K1
------------------------------------------------------------------------
r49502 | aaronz@vt.edu | 2008-07-29 13:33:53 +0200 (Tue, 29 Jul 2008) |
3 lines

http://jira.sakaiproject.org/jira/browse/SAK-14079
Added in naming and added configurable cache beans as requested by
smarquard, tested to make sure the caches are being used
Fixed up the classpath that was broken
------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c49502 https://source.sakaiproject.org/svn/db/branches/pre-K1 db/
U    db/db-util/.classpath
U
db/db-util/storage/src/java/org/sakaiproject/util/BaseDbFlatStorage.java
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn log -r49637
https://source.sakaiproject.org/svn/db/branches/pre-K1
------------------------------------------------------------------------
r49637 | aaronz@vt.edu | 2008-07-29 15:52:51 +0200 (Tue, 29 Jul 2008) |
2 lines

http://jira.sakaiproject.org/jira/browse/SAK-14079
Accidently committed something from another JIRA as well, removing that
part of the commit
------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c49637 https://source.sakaiproject.org/svn/db/branches/pre-K1 db
G    db/db-impl/pack/src/webapp/WEB-INF/components.xml
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn log -r49649
https://source.sakaiproject.org/svn/db/branches/pre-K1
------------------------------------------------------------------------
r49649 | aaronz@vt.edu | 2008-07-29 17:48:44 +0200 (Tue, 29 Jul 2008) |
2 lines

http://jira.sakaiproject.org/jira/browse/SAK-14079
Added in the extra requested cache beans for Marquard
------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c49649 https://source.sakaiproject.org/svn/db/branches/pre-K1 db/
G    db/db-impl/pack/src/webapp/WEB-INF/components.xml


------------------------------------------------------------------------


 discussion/ 

------------------------------------------------------------------------


 email/ 

------------------------------------------------------------------------


 entity/ 

------------------------------------------------------------------------


 entitybroker/ 

------------------------------------------------------------------------
r48725 | david.horwitz@uct.ac.za | 2008-07-16 00:13:39 -0700 (Wed, 16 Jul 2008) | 32 lines

svn log -r47285 https://source.sakaiproject.org/svn/entitybroker/trunk/
------------------------------------------------------------------------
r47285 | aaronz@vt.edu | 2008-06-07 04:51:21 +0200 (Sat, 07 Jun 2008) |
2 lines

http://jira.sakaiproject.org/jira/browse/SAK-13681
Fixed up the JSON collection creation code
------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c47285 https://source.sakaiproject.org/svn/entitybroker/trunk/
entitybroker/
U
entitybroker/impl/src/java/org/sakaiproject/entitybroker/impl/EntityHandlerImpl.java
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn log -r47351
https://source.sakaiproject.org/svn/entitybroker/trunk/
------------------------------------------------------------------------
r47351 | aaronz@vt.edu | 2008-06-10 22:04:11 +0200 (Tue, 10 Jun 2008) |
2 lines

http://jira.sakaiproject.org/jira/browse/SAK-13681
Switched from using the JSONHierarchical to the Jettison driver, even
though the output is uglier at least it produces valid JSON
------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c47351 https://source.sakaiproject.org/svn/entitybroker/trunk/
entitybroker/
U
entitybroker/impl/src/test/org/sakaiproject/entitybroker/impl/EntityHandlerImplTest.java
G
entitybroker/impl/src/java/org/sakaiproject/entitybroker/impl/EntityHandlerImpl.java


------------------------------------------------------------------------
r48774 | david.horwitz@uct.ac.za | 2008-07-17 08:03:16 -0700 (Thu, 17 Jul 2008) | 40 lines

svn log -r48256 https://source.sakaiproject.org/svn/entitybroker/trunk/
------------------------------------------------------------------------
r48256 | aaronz@vt.edu | 2008-06-27 18:00:51 +0200 (Fri, 27 Jun 2008) |
2 lines

http://jira.sakaiproject.org/jira/browse/SAK-13868
Fixed up the handler to create better formatted HTML and to create valid
HTML and XML with types specified in the file and in the response
------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-r48256 https://source.sakaiproject.org/svn/entitybroker/trunk/
entitybroker/
svn: Second revision required
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c48256 https://source.sakaiproject.org/svn/entitybroker/trunk/
entitybroker/
U
entitybroker/impl/src/java/org/sakaiproject/entitybroker/impl/EntityHandlerImpl.java
C    entitybroker/pom.xml
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn resolved
entitybroker/pom.xml
Resolved conflicted state of 'entitybroker/pom.xml'
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn log -r48744
https://source.sakaiproject.org/svn/entitybroker/trunk/
------------------------------------------------------------------------
r48744 | aaronz@vt.edu | 2008-07-16 17:16:50 +0200 (Wed, 16 Jul 2008) |
2 lines

http://jira.sakaiproject.org/jira/browse/SAK-13868
Updated to force all direct content to be UTF-8 by default
------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c48744 https://source.sakaiproject.org/svn/entitybroker/trunk/
entitybroker/
G
entitybroker/impl/src/java/org/sakaiproject/entitybroker/impl/EntityHandlerImpl.java
U
entitybroker/tool/src/java/org/sakaiproject/entitybroker/servlet/DirectServlet.java


------------------------------------------------------------------------
r48775 | david.horwitz@uct.ac.za | 2008-07-17 08:08:15 -0700 (Thu, 17 Jul 2008) | 2 lines

SAK-13868 resolve bad manual conflict resolution

------------------------------------------------------------------------


 event/ 

------------------------------------------------------------------------
r50241 | david.horwitz@uct.ac.za | 2008-08-06 06:30:17 -0700 (Wed, 06 Aug 2008) | 2 lines

SAK-14145  correct the parents pom

------------------------------------------------------------------------


 gradebook/ 



 help/ 



 jcr/ 

------------------------------------------------------------------------


 jobscheduler/ 



 jsf/ 

------------------------------------------------------------------------


 linktool/ 

------------------------------------------------------------------------


 login/ 



 mailarchive/ 

------------------------------------------------------------------------
r48547 | bkirschn@umich.edu | 2008-07-08 07:45:25 -0700 (Tue, 08 Jul 2008) | 1 line

SAK-12769 portuguese for 2.5.x
------------------------------------------------------------------------


 mailtool/ 

------------------------------------------------------------------------
r49046 | sswinsb2@une.edu.au | 2008-07-20 15:05:28 -0700 (Sun, 20 Jul 2008) | 1 line

SAK-11181 Mailtool emails don't set RFC 2822 required Date header
------------------------------------------------------------------------


 master/ 



 melete/ 

------------------------------------------------------------------------
r50229 | mjwenk@ucdavis.edu | 2008-06-11 13:58:14 -0700 (Wed, 11 Jun 2008) | 1 line

Copying melete to ucd repository for local ucd modifications. Command used: svn copy -r 47894 https://source.sakaiproject.org/contrib/foothill/melete/tags/melete_2-4-5_sak-2-5-0 sakai_2.5.x
------------------------------------------------------------------------
r50230 | mjwenk@ucdavis.edu | 2008-06-11 14:01:24 -0700 (Wed, 11 Jun 2008) | 1 line

SAK-1942 - Melete on 2.5.x
------------------------------------------------------------------------
r50239 | mjwenk@ucdavis.edu | 2008-06-11 17:22:44 -0700 (Wed, 11 Jun 2008) | 1 line

changed vers in pom
------------------------------------------------------------------------


 memory/ 

------------------------------------------------------------------------


 message/ 

------------------------------------------------------------------------


 metaobj/ 

------------------------------------------------------------------------
r48728 | david.horwitz@uct.ac.za | 2008-07-16 02:47:41 -0700 (Wed, 16 Jul 2008) | 14 lines

svn log -r47722 https://source.sakaiproject.org/svn/metaobj/trunk/
------------------------------------------------------------------------
r47722 | john.ellis@rsmart.com | 2008-06-19 20:15:34 +0200 (Thu, 19 Jun
2008) | 3 lines

SAK-13718
applied patch

------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c47722 https://source.sakaiproject.org/svn/metaobj/trunk/ metaobj/
U
metaobj/metaobj-impl/api-impl/src/java/org/sakaiproject/metaobj/utils/xml/impl/DateFormatterElementType.java

------------------------------------------------------------------------
r49099 | sswinsb2@une.edu.au | 2008-07-21 15:44:08 -0700 (Mon, 21 Jul 2008) | 1 line

SAK-4652 update osp tool descriptions
------------------------------------------------------------------------
r49423 | david.horwitz@uct.ac.za | 2008-07-28 07:56:02 -0700 (Mon, 28 Jul 2008) | 50 lines

svn log -r45629
https://source.sakaiproject.org/svn/osp/trunk/
------------------------------------------------------------------------
r45629 | john.ellis@rsmart.com | 2008-04-21 23:17:38 +0200 (Mon, 21 Apr
2008) | 2 lines

SAK-12842

------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c45629 https://source.sakaiproject.org/svn/osp/trunk/ osp
U
osp/matrix/api/src/java/org/theospi/portfolio/matrix/model/Cell.java
U
osp/matrix/tool/src/java/org/theospi/portfolio/matrix/control/CellFormPickerController.java
U
osp/matrix/tool/src/java/org/theospi/portfolio/matrix/control/ReviewHelperController.java
U    osp/matrix/tool/src/webapp/WEB-INF/jsp/matrix/viewCell.jsp

------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c-46549
https://source.sakaiproject.org/svn/metaobj/branches/sakai_2-5-x/
metaobj/
U
metaobj/metaobj-impl/api-impl/src/resources/org/sakaiproject/metaobj/shared/control/formCreate.xslt
D
metaobj/metaobj-api/api/src/java/org/sakaiproject/metaobj/shared/Helper.java
U
metaobj/metaobj-api/api/src/java/org/sakaiproject/metaobj/shared/model/ElementBean.java
U
metaobj/metaobj-util/tool-lib/src/java/org/sakaiproject/metaobj/shared/control/FormHelperController.java
U
metaobj/metaobj-util/tool-lib/src/java/org/sakaiproject/metaobj/shared/control/ToolFinishedView.java
U
metaobj/metaobj-util/tool-lib/src/java/org/sakaiproject/metaobj/shared/control/XsltArtifactView.java
U
metaobj/metaobj-util/tool-lib/src/java/org/sakaiproject/spring/util/SpringTool.java
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c-46549 https://source.sakaiproject.org/svn/osp/branches/sakai_2-5-x/
osp/
U
osp/matrix/api/src/java/org/theospi/portfolio/matrix/model/Cell.java
U
osp/matrix/tool/src/java/org/theospi/portfolio/matrix/control/CellFormPickerController.java
U
osp/matrix/tool/src/java/org/theospi/portfolio/matrix/control/ReviewHelperController.java
U    osp/matrix/tool/src/webapp/WEB-INF/jsp/matrix/viewCell.jsp


------------------------------------------------------------------------


 msgcntr/ 

------------------------------------------------------------------------
r48557 | bkirschn@umich.edu | 2008-07-08 07:46:02 -0700 (Tue, 08 Jul 2008) | 1 line

SAK-12769 portuguese for 2.5.x
------------------------------------------------------------------------
r48740 | david.horwitz@uct.ac.za | 2008-07-16 07:51:09 -0700 (Wed, 16 Jul 2008) | 14 lines

svn log -r47394 https://source.sakaiproject.org/svn/msgcntr/trunk/
------------------------------------------------------------------------
r47394 | wang58@iupui.edu | 2008-06-11 17:41:57 +0200 (Wed, 11 Jun 2008)
| 2 lines

SAK-13528 Action links in Messages aren't always rendered in a single
line
-Apply the patch.
------------------------------------------------------------------------
dhorwitz@david-horwitz-6:~/branchManagement/sakai_2-5-x> svn merge
-c47394 https://source.sakaiproject.org/svn/msgcntr/trunk/ msgcntr/
U    msgcntr/messageforums-app/src/webapp/jsp/privateMsg/msgHeader.jsp


------------------------------------------------------------------------
r48799 | stephen.marquard@uct.ac.za | 2008-07-17 19:02:18 -0700 (Thu, 17 Jul 2008) | 1 line

NOJIRA Update help docs (synchronize with IU KB)
------------------------------------------------------------------------


 patches/ 



 podcasts/ 

------------------------------------------------------------------------
r48558 | bkirschn@umich.edu | 2008-07-08 07:46:04 -0700 (Tue, 08 Jul 2008) | 1 line

SAK-12769 portuguese for 2.5.x
------------------------------------------------------------------------
r48800 | stephen.marquard@uct.ac.za | 2008-07-17 19:02:36 -0700 (Thu, 17 Jul 2008) | 1 line

NOJIRA Update help docs (synchronize with IU KB)
------------------------------------------------------------------------
r49137 | stephen.marquard@uct.ac.za | 2008-07-22 19:05:32 -0700 (Tue, 22 Jul 2008) | 1 line

NOJIRA Update help docs (synchronize with IU KB)
------------------------------------------------------------------------


 polls/ 

------------------------------------------------------------------------


 portal/ 



 postem/ 

------------------------------------------------------------------------


 presence/ 

------------------------------------------------------------------------


 presentation/ 

------------------------------------------------------------------------


 privacy/ 

------------------------------------------------------------------------


 profile/ 

------------------------------------------------------------------------
r48549 | bkirschn@umich.edu | 2008-07-08 07:45:29 -0700 (Tue, 08 Jul 2008) | 1 line

SAK-12769 portuguese for 2.5.x
------------------------------------------------------------------------


 providers/ 



 reference/ 



 reports/ 

------------------------------------------------------------------------
r49101 | sswinsb2@une.edu.au | 2008-07-21 15:45:06 -0700 (Mon, 21 Jul 2008) | 1 line

SAK-4652 update osp tool descriptions
------------------------------------------------------------------------


 reset-pass/ 

------------------------------------------------------------------------


 rights/ 

------------------------------------------------------------------------


 roster/ 

------------------------------------------------------------------------


 rwiki/ 



 sakai-mock/ 

------------------------------------------------------------------------


 sam/ 



 samples/ 

------------------------------------------------------------------------


 search/ 

------------------------------------------------------------------------
r48552 | bkirschn@umich.edu | 2008-07-08 07:45:36 -0700 (Tue, 08 Jul 2008) | 1 line

SAK-12769 portuguese for 2.5.x
------------------------------------------------------------------------


 sections/ 

------------------------------------------------------------------------


 site/ 



 site-manage/ 



 site-management/ 



 syllabus/ 

------------------------------------------------------------------------


 test-harness/ 



 textarea/ 

------------------------------------------------------------------------


 tool/ 



 ucd-admin-tool/ 



 ucd-course-grade-converter/ 



 ucd-db/ 



 ucd-enterprise-data-service/ 



 ucd-form-based-distauth/ 



 ucd-stats/ 



 user/ 



 usermembership/ 

------------------------------------------------------------------------


 util/ 

------------------------------------------------------------------------


 velocity/ 

------------------------------------------------------------------------


 warehouse/ 

------------------------------------------------------------------------


 web/ 

------------------------------------------------------------------------


 webservices/ 

------------------------------------------------------------------------