Clone
 

andrew poland <andrew@poland.cx> in Sakai.Git

svn merge -c 37036 https://source.sakaiproject.org/svn/rwiki/trunk U rwiki-tool/tool/src/java/uk/ac/cam/caret/sakai/rwiki/tool/RWikiServlet.java U rwiki-tool/tool/src/webapp/WEB-INF/vm/view.vm U rwiki-tool/tool/src/webapp/WEB-INF/vm/macros.vm svn log -r 37036 https://source.sakaiproject.org/svn/rwiki/trunk ------------------------------------------------------------------------ r37036 | ian@caret.cam.ac.uk | 2007-10-15 20:42:31 -0400 (Mon, 15 Oct 2007) | 4 lines

http://jira.sakaiproject.org/jira/browse/SAK-11788

Fixed

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

git-svn-id: https://source.sakaiproject.org/svn/rwiki/branches/sakai_2-5-x@37181 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-11293 remove DBCP dependency

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

svn merge -c 34463 https://source.sakaiproject.org/svn/jobscheduler/branches/oncourse_2-4-x Skipped missing target: 'scheduler-component-shared/project.xml' U scheduler-component-shared/src/java/org/sakaiproject/component/app/scheduler/SchedulerManagerImpl.java Skipped missing target: 'scheduler-api/project.xml' U scheduler-api/src/java/org/sakaiproject/api/app/scheduler/SchedulerManager.java

svn log -r 34463 https://source.sakaiproject.org/svn/jobscheduler/branches/oncourse_2-4-x

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

r34463 | ajpoland@iupui.edu | 2007-08-27 13:30:32 -0400 (Mon, 27 Aug 2007) | 1 line

SAK-11293 remove DBCP dependency

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

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

svn merge -c 36860 https://source.sakaiproject.org/svn/rwiki/trunk U rwiki-tool/tool/src/webapp/scripts/stateswitcher.js svn log -r 36860 https://source.sakaiproject.org/svn/rwiki/trunk ------------------------------------------------------------------------ r36860 | ian@caret.cam.ac.uk | 2007-10-15 13:18:51 -0400 (Mon, 15 Oct 2007) | 4 lines

http://jira.sakaiproject.org/jira/browse/SAK-11014

Fixed

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

git-svn-id: https://source.sakaiproject.org/svn/rwiki/branches/sakai_2-5-x@36951 66ffb92e-73f9-0310-93c1-f5514f145a0a

create 2.5.0 branch

git-svn-id: https://source.sakaiproject.org/svn/rwiki/branches/sakai_2-5-x@36166 66ffb92e-73f9-0310-93c1-f5514f145a0a

make sure svn:externals property is updated

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

SAK-11538 add reset-pass to pom

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

add reset-pass project

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

import reset-pass from /contrib/uct/reset-pass

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

    • -0
    • +1
    /reset-pass/project.properties
    • -0
    • +27
    /reset-pass/project.xml
    • -0
    • +24
    /reset-pass/reset-pass-help/pom.xml
    • -0
    • +234
    /reset-pass/reset-pass/pom.xml
    • -0
    • +5
    /reset-pass/reset-pass/project.properties
    • -0
    • +238
    /reset-pass/reset-pass/project.xml
  1. … 7 more files in changeset.
$ svn merge -c 33134 https://source.sakaiproject.org/svn/site-manage/branches/sakai_2-4-x U site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java in-143-163:site-manage ajpoland$ svn log -r 33134 https://source.sakaiproject.org/svn/site-manage/branches/sakai_2-4-x ------------------------------------------------------------------------ r33134 | ajpoland@iupui.edu | 2007-07-25 14:11:47 -0400 (Wed, 25 Jul 2007) | 1 line

SAK-10899 MC synoptic view is now removed/added when the tools are removed/added

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

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

SAK-10899 MC synoptic view is now removed/added when the tools are removed/added

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

SAK-10611 change ScheduledInvocationRunner to a StatefulJob

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

SAK-10571 fixed extra space in column name in hibernate mapping -- updated sql conversion scripts to match new key column id names

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

SAK-10571 fixed extra space in column name in hibernate mapping -- updated sql conversion scripts to match new key column id names

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

SAK-10854 Enable aggregate javadoc reporting

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

SAK-10423 Default value for Messages/Forums 'DELETED' column

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

SAK-10423 Default value for Messages/Forums 'DELETED' column

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

SAK-10423 Default value for Messages/Forums 'DELETED' column

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

SAK-10423 Default value for Messages/Forums 'DELETED' column

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

SAK-10376 Putting this change back in

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

    • -2
    • +1
    /jobscheduler/scheduler-tool/project.xml
add reports and warehouse

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

SAK-8610 Merging Ray's work to convert us to spring 2.0.6

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

SAK-8610 Merging Ray's work to convert us to spring 2.0.6

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

    • -61
    • +16
    /site-manage/pageorder/tool/pom.xml
    • -3
    • +3
    /site-manage/pageorder/tool/project.properties
SAK-8610 Merging Ray's work to convert us to spring 2.0.6

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

SAK-8610 Merging Ray's work to convert us to spring 2.0.6

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

SAK-8610 Merging Ray's work to convert us to spring 2.0.6

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

SAK-8610 Merging Ray's work to convert us to spring 2.0.6

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

SAK-8610 Merging Ray's work to convert us to spring 2.0.6

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

SAK-8610 Merging Ray's work to convert us to spring 2.0.6

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

SAK-8610 Merging Ray's work to convert us to spring 2.0.6

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