lp:~aelkner/cando/lucid_release

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:~vcs-imports/cando/trunk

Gediminas Paulauskas (community): Approve on 2010-06-02

VCS imports: Pending requested 2010-05-10

Diff: 368 lines (+87/-56) (has conflicts)

14 files modified

Makefile (+17/-0)
base.cfg (+35/-0)
buildout.cfg (+5/-28)
setup.py (+3/-3)
src/cando/gradebook/browser/README.txt (+5/-2)
src/cando/gradebook/browser/student.py (+1/-1)
src/cando/iep/README.txt (+5/-4)
src/cando/message/message.py (+1/-1)
src/cando/message/tests.py (+1/-1)
src/cando/newskin/teacher.txt (+1/-4)
src/cando/skilldriver/README.txt (+4/-3)
src/cando/skilldriver/tests.py (+1/-1)
src/cando/virginia/browser/README.txt (+6/-6)
src/cando/virginia/browser/configure.zcml (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1020. By Alan Elkner <aelkner@ubuntu> on 2010-05-10

fixes for lucid release

1019. By menesis on 2010-03-17

Remove more references to python2.4

1018. By menesis on 2010-03-17

Do not specify python2.4 in a script

1017. By menesis on 2010-03-15

ftest coverage support

1016. By menesis on 2010-03-10

Post-release version bump

1015. By menesis on 2010-03-10

Release 2010.03

1014. By menesis on 2010-03-10

Merge Douglas' branch:
* Added the IEP functionality (https://blueprints.launchpad.net/cando/+spec/iep)
* Added the Validated Competency Certificate
  (https://blueprints.launchpad.net/cando/+spec/competency-certificate)

svn merge svn+ssh://svn.schooltool.org/svn/cando/branches/replaceafill-schooltool-1.2 -r 1656:HEAD

1013. By menesis on 2009-12-01

Post-release version bump

1012. By menesis on 2009-12-01

Release 2009.11

1011. By menesis on 2009-12-01

Remove obsolete release stuff