projects / Syrup.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 00c86e2) | patch
Merged 2010-02-campus-integration-reorg branch changes r797:849 into trunk
authorgfawcett <gfawcett@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Tue, 4 May 2010 01:48:22 +0000 (01:48 +0000)
committergfawcett <gfawcett@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Tue, 4 May 2010 01:48:22 +0000 (01:48 +0000)
commitdcd41d7916da854561959ca06e71ca8743dec250
tree37082c8e17d3416f05944f46ebff30f589a9a449tree
parent00c86e2ef5409b04976b1e499b3dd9b28bddc148commit | diff
Merged 2010-02-campus-integration-reorg branch changes r797:849 into trunk

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@878 6d9bc8c9-1ec2-4278-b937-99fde70a366f
16 files changed:
.gitignore diff | blob | history
conifer/BRANCH-TODO.org [new file with mode: 0644] blob
conifer/custom/README [new file with mode: 0644] blob
conifer/custom/course_codes.py [deleted file] blob | history
conifer/custom/course_sections.py [deleted file] blob | history
conifer/integration/.header.tex [new file with mode: 0644] blob
conifer/integration/COURSE_CODES.txt [new file with mode: 0644] blob
conifer/integration/COURSE_SECTIONS.txt [new file with mode: 0644] blob
conifer/integration/__init__.py [new file with mode: 0644] blob
conifer/integration/campus-interface.md [new file with mode: 0644] blob
conifer/integration/default.py [new file with mode: 0644] blob
conifer/integration/example.py [new file with mode: 0644] blob
conifer/settings.py diff | blob | history
conifer/syrup/models.py diff | blob | history
conifer/syrup/views/courses.py diff | blob | history
conifer/templates/edit_course_permissions.xhtml diff | blob | history
Syrup