← Back to branch summary

~aelkner/schooltool/schooltool.lyceum.journal_october_release

~aelkner/schooltool/schooltool.lyceum.journal_october_release

Viewing all changes in revision 144.

Committer: Ignas Mikalajūnas
Date: 2009-01-12 14:40:57 UTC
mfrom: (140.1.2 schooltool.lyceum.journal)
Revision ID: ignas@pov.lt-20090112144057-pjmpchm0vl6dlst0

Merge fixes made by Justas to trunk.

files added:
src/schooltool/lyceum/journal/browser/templates/journal_js.pt

files removed:
src/schooltool/lyceum/journal/browser/resources

src/schooltool/lyceum/journal/browser/resources/journal.js

files modified:
src/schooltool/lyceum/journal/browser/configure.zcml

src/schooltool/lyceum/journal/browser/journal.py

src/schooltool/lyceum/journal/browser/templates/journal.pt

src/schooltool/lyceum/journal/browser/templates/no_timetable_journal.pt

src/schooltool/lyceum/journal/browser/tests/test_journal.py

src/schooltool/lyceum/journal/ftests/journal.txt

src/schooltool/lyceum/journal/resources/journal.css

Show diffs side-by-side

added added

removed removed

src/schooltool/lyceum/journal/browser/configure.zcml

src/schooltool/lyceum/journal/browser/journal.py

src/schooltool/lyceum/journal/browser/resources/

src/schooltool/lyceum/journal/browser/resources/journal.js

src/schooltool/lyceum/journal/browser/templates/journal.pt

src/schooltool/lyceum/journal/browser/templates/journal_js.pt

src/schooltool/lyceum/journal/browser/templates/no_timetable_journal.pt

src/schooltool/lyceum/journal/browser/tests/test_journal.py

src/schooltool/lyceum/journal/ftests/journal.txt

src/schooltool/lyceum/journal/resources/journal.css

Older »