Clone
 

chen wen <cwen@iupui.edu> in Sakai.Git

SAK-15571 => apply patch for syllabus trunk

git-svn-id: https://source.sakaiproject.org/svn/syllabus/trunk@59804 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-14791, SAK-15450

git-svn-id: https://source.sakaiproject.org/svn/syllabus/trunk@57580 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-14989

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@57493 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-15418

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@57492 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-14568

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@57491 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-14564

git-svn-id: https://source.sakaiproject.org/svn/msgcntr/trunk@57487 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-13307

git-svn-id: https://source.sakaiproject.org/svn/syllabus/trunk@57486 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-14073

git-svn-id: https://source.sakaiproject.org/svn/msgcntr/trunk@57245 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-14221

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@56958 66ffb92e-73f9-0310-93c1-f5514f145a0a

revert SAK-15223 from trunk. this depends on the schema changes from non-cal branch. vn merge -r 56620:56619 https://source.sakaiproject.org/svn/gradebook/trunk . U service/impl/src/java/org/sakaiproject/component/gradebook/GradebookExternalAssessmentServiceImpl.java cwen:gb_trunk cwen$ svn log -r 56620 https://source.sakaiproject.org/svn/gradebook/trunk ------------------------------------------------------------------------ r56620 | cwen@iupui.edu | 2009-01-23 14:22:59 -0500 (Fri, 23 Jan 2009) | 17 lines

svn merge -c 55692 https://source.sakaiproject.org/svn/gradebook/branches/non-cal .

U service/impl/src/java/org/sakaiproject/component/gradebook/GradebookExternalAssessmentServiceImpl.java

cwen:gb_trunk cwen$ svn log -r 55692 https://source.sakaiproject.org/svn/gradebook/branches/non-cal

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

r55692 | cwen@iupui.edu | 2008-12-30 10:09:08 -0500 (Tue, 30 Dec 2008) | 1 line

SAK-15223

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

cwen:gb_trunk cwen$ svn merge -c 55694 https://source.sakaiproject.org/svn/gradebook/branches/non-cal .

G service/impl/src/java/org/sakaiproject/component/gradebook/GradebookExternalAssessmentServiceImpl.java

cwen:gb_trunk cwen$ svn log -r 55694 https://source.sakaiproject.org/svn/gradebook/branches/non-cal

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

r55694 | cwen@iupui.edu | 2008-12-30 10:25:02 -0500 (Tue, 30 Dec 2008) | 1 line

SAK-15223

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

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@56831 66ffb92e-73f9-0310-93c1-f5514f145a0a

svn merge -c 55692 https://source.sakaiproject.org/svn/gradebook/branches/non-cal . U service/impl/src/java/org/sakaiproject/component/gradebook/GradebookExternalAssessmentServiceImpl.java cwen:gb_trunk cwen$ svn log -r 55692 https://source.sakaiproject.org/svn/gradebook/branches/non-cal ------------------------------------------------------------------------ r55692 | cwen@iupui.edu | 2008-12-30 10:09:08 -0500 (Tue, 30 Dec 2008) | 1 line

SAK-15223

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

cwen:gb_trunk cwen$ svn merge -c 55694 https://source.sakaiproject.org/svn/gradebook/branches/non-cal .

G service/impl/src/java/org/sakaiproject/component/gradebook/GradebookExternalAssessmentServiceImpl.java

cwen:gb_trunk cwen$ svn log -r 55694 https://source.sakaiproject.org/svn/gradebook/branches/non-cal

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

r55694 | cwen@iupui.edu | 2008-12-30 10:25:02 -0500 (Tue, 30 Dec 2008) | 1 line

SAK-15223

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

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@56620 66ffb92e-73f9-0310-93c1-f5514f145a0a

apply patch for SAK-13408

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@52958 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-13646: add conversion script.

git-svn-id: https://source.sakaiproject.org/svn/reference/trunk@52717 66ffb92e-73f9-0310-93c1-f5514f145a0a

apply patch for SAK-13646 => the patch doesn't break unit test. did a quick test in GB, it doesn't seem to break the application. will check in DB conversion script in a few after i tested with Oracle.

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@52695 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-14471

git-svn-id: https://source.sakaiproject.org/svn/chat/trunk@52463 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-14471

git-svn-id: https://source.sakaiproject.org/svn/chat/trunk@52462 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-13652 applied patch. didn't break unit test or the application.

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@52461 66ffb92e-73f9-0310-93c1-f5514f145a0a

    • -0
    • +85
    /gradebook/sample-grade-finalizer/README.txt
    • -0
    • +107
    /gradebook/sample-grade-finalizer/pom.xml
SAK-13672

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@52459 66ffb92e-73f9-0310-93c1-f5514f145a0a

    • -3
    • +3
    /gradebook/app/ui/src/webapp/instructorView.jsp
    • -2
    • +2
    /gradebook/app/ui/src/webapp/overview.jsp
    • -3
    • +3
    /gradebook/app/ui/src/webapp/studentView.jsp
SAK-14291: add conversion script

git-svn-id: https://source.sakaiproject.org/svn/syllabus/trunk@51400 66ffb92e-73f9-0310-93c1-f5514f145a0a

    • -0
    • +2
    /syllabus/syllabus-app/src/sql/mysql/SAK-14291-mysql.sql
    • -0
    • +2
    /syllabus/syllabus-app/src/sql/oracle/SAK-14291-oracle.sql
add conversion for SAK-14291 to 2.6

git-svn-id: https://source.sakaiproject.org/svn/reference/trunk@51398 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-14291

git-svn-id: https://source.sakaiproject.org/svn/syllabus/trunk@51397 66ffb92e-73f9-0310-93c1-f5514f145a0a

Check in for Tan for SAK-12433 svn merge -r 39290:39291 https://source.sakaiproject.org/svn/site-manage/branches/SAK-12433 M 45582 site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java M 45582 site-manage-tool/tool/src/bundle/sitesetupgeneric.properties A + - site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-importSitesMigrate.v m M 45582 site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-import.vm A + - site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-importSelec tion.vm A + - site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-importMigra te.vm

svn log -r 39291

https://source.sakaiproject.org/svn/site-manage/branches/SAK-12433

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

r39291 | cwen@iupui.edu | 2007-12-14 16:41:56 -0500 (Fri, 14 Dec 2007) | 1

line

sak-12433.

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

svn merge -r 39465:39466

https://source.sakaiproject.org/svn/site-manage/branches/SAK-12433

G

site-manage-tool/tool/src/webapsite-sitesetup/chef_site-importSitesMigrate.v

m

svn log -r 39465:39466

https://source.sakaiproject.org/svn/site-manage/branches/SAK-12433

---------------------------------------------------------------------------------------------------------------------------0500 (Tue, 18 Dec 2007) |

1 line

SAK-12480 - Fixed clicking back button in replace will take user back to

replace wizard.

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

svn merge -r 39470:39471

https://source.sakaiproject.org/svn/site-manage/branches/SAK-12433

M 45582

site-manage-toolsite-manage-toolsite-manage-toolsite-manage-toolsite-man39471

https://source.sakaiproject.org/svn/site-manage/branches/SAK-12433

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

r39471 | tnguyen@iupui.edu | 2007-12-18 17:00:00 -0500 (Tue, 18 Dec 2007) |

1 line

SAK-12492

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

svn merge -r 39818:39819

https://source.sakaiproject.org/svn/site-manage/branches/SAK-12433

M site-manage-tool/tool/src/bundle/sitesetupgeneric.properties

M

site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-importMigra

te.vm

svn log -r 39818:39819

https://source.sakaiproject.org/svn/site-manage/branches/SAK-12433

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

r39819 | tnguyen@iupui.edu | 2008-01-08 11:05:32 -0500 (Tue, 08 Jan 2008) |

1 line

ONC-281 - Site Import / Replace data text change.

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

svn merge -r 39869:39870

https://source.sakaiproject.org/svn/site-manage/branches/SAK-12433

M

site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java

svn log -r39870

https://source.sakaiproject.org/svn/site-manage/branches/SAK-12433

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

r39870 | tnguyen@iupui.edu | 2008-01-08 16:20:51 -0500 (Tue, 08 Jan 2008) |

1 line

SAK-12541 - Fix Web Content and News Tools for Import From Site.

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

svn merge -r 40142:40143

https://source.sakaiproject.org/svn/site-manage/branches/SAK-12433

G site-manage-tool/tool/src/G site-manage-tool/tool/src/G site-manage-tool/tol/tool/src/webapp/vm/sitesetup/chef_site-importSitesMigrate.v

m

svn log -r40143

https://source.sakaiproject.org/svn/site-manage/branches/SAK-12433

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

r40143 | tnguyen@iupui.edu | 2008-01-15 16:18:25 -0500 (Tue, 15 Jan 2008) |

1 line

SAK-12539 - Add text message for Wiki Import From Site to explain the child

content will not be removed.

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

git-svn-id: https://source.sakaiproject.org/svn/site-manage/trunk@45794 66ffb92e-73f9-0310-93c1-f5514f145a0a

Check in for Tan for SAK-12433 svn merge -r 39268:39269 https://source.sakaiproject.org/svn/calendar/branches/oncourse_opc_122007 M 45552 calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/BaseCalendarServi ce.java

svn log -r39269

https://source.sakaiproject.org/svn/calendar/branches/oncourse_opc_122007

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

r39269 | cwen@iupui.edu | 2007-12-14 11:16:15 -0500 (Fri, 14 Dec 2007) | 1

line

SAK-12433.

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

svn merge -r 39312:39313

https://source.sakaiproject.org/svn/calendar/branches/oncourse_opc_122007

M 45552

calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/BaseCalendarServi

ce.java

svn log -r39313

https://source.sakaiproject.org/svn/calendar/branches/oncourse_opc_122007

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

r39313 | cwen@iupui.edu | 2007-12-15 12:02:27 -0500 (Sat, 15 Dec 2007) | 1

line

SAK-12433 => apply patch for calendar.

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

git-svn-id: https://source.sakaiproject.org/svn/calendar/trunk@45559 66ffb92e-73f9-0310-93c1-f5514f145a0a

Check in for Tan for SAK-12433 svn merge -r 39301:39302 https://source.sakaiproject.org/svn/assignment/branches/oncourse_2-4-x M 45555 assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmen tService.java

svn log -r39302

https://source.sakaiproject.org/svn/assignment/branches/oncourse_2-4-x

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

r39302 | cwen@iupui.edu | 2007-12-14 17:47:16 -0500 (Fri, 14 Dec 2007) | 1

line

sak-12433.

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

svn merge -r 39555:39556

https://source.sakaiproject.org/svn/assignment/branches/oncourse_2-4-x

M 45555

assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmen

tService.java

svn log -r39556

https://source.sakaiproject.org/svn/assignment/branches/oncourse_2-4-x

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

r39556 | tnguyen@iupui.edu | 2007-12-20 13:37:49 -0500 (Thu, 20 Dec 2007) |

1 line

SAK-12433 => fixes for assignment removal authz permission problems.

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

git-svn-id: https://source.sakaiproject.org/svn/assignment/trunk@45558 66ffb92e-73f9-0310-93c1-f5514f145a0a

Check in for Tan for SAK-12433 svn merge -r 39258:39259 https://source.sakaiproject.org/svn/announcement/branches/oncourse_opc_12200 7 M 45514 announcement-impl/impl/src/java/org/sakaiproject/announcement/impl/BaseAnnou ncementService.java

svn log -r39259

https://source.sakaiproject.org/svn/announcement/branches/oncourse_opc_12200

7

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

r39259 | cwen@iupui.edu | 2007-12-14 09:34:28 -0500 (Fri, 14 Dec 2007) | 1

line

SAK-12433

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

git-svn-id: https://source.sakaiproject.org/svn/announcement/trunk@45556 66ffb92e-73f9-0310-93c1-f5514f145a0a

Check in for Tan for SAK-12433. svn merge -r 39316:39317 https://source.sakaiproject.org/svn/sam/branches/SAK-12433 M 45500 samigo-services/src/java/org/sakaiproject/tool/assessment/services/assessmen t/AssessmentEntityProducer.java

svn log -r39317 https://source.sakaiproject.org/svn/sam/branches/SAK-12433

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

r39317 | cwen@iupui.edu | 2007-12-15 14:14:50 -0500 (Sat, 15 Dec 2007) | 1

line

SAK-12433.

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

git-svn-id: https://source.sakaiproject.org/svn/sam/trunk@45511 66ffb92e-73f9-0310-93c1-f5514f145a0a

Check in for Tan for SAK-12433. svn merge -r 39291:39292 https://source.sakaiproject.org/svn/rwiki/branches/SAK-12433 M 45491 rwiki-impl/impl/src/java/uk/ac/cam/caret/sakai/rwiki/component/service/impl/ RWikiObjectServiceImpl.java

svn log -r39292 https://source.sakaiproject.org/svn/rwiki/branches/SAK-12433

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

r39292 | cwen@iupui.edu | 2007-12-14 17:12:33 -0500 (Fri, 14 Dec 2007) | 1

line

sak-12433.

git-svn-id: https://source.sakaiproject.org/svn/rwiki/trunk@45510 66ffb92e-73f9-0310-93c1-f5514f145a0a

svn merge -r 39287:39288 https://source.sakaiproject.org/svn/content/branches/SAK-12433 M 45452 content-impl/impl/src/java/org/sakaiproject/content/impl/BaseContentService.java

svn log -r39288 https://source.sakaiproject.org/svn/content/branches/SAK-12433

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

r39288 |cwen@iupui.edu | 2007-12-14 15:59:06 -0500 (Fri, 14 Dec 2007) | 1 line

sak-12433.

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

git-svn-id: https://source.sakaiproject.org/svn/content/trunk@45460 66ffb92e-73f9-0310-93c1-f5514f145a0a

http://bugs.sakaiproject.org/jira/browse/SAK-13341 SAK-13341 => small text change - remove Alert:

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@45281 66ffb92e-73f9-0310-93c1-f5514f145a0a