← Back to branch summary

~justas.sadzevicius/schooltool/flourish_timetables

~justas.sadzevicius/schooltool/flourish_timetables

Viewing all changes in revision 2950.

Committer: Justas Sadzevicius
Date: 2011-07-04 07:21:29 UTC
mfrom: (2943.1.21 st-flourish)
Revision ID: justas@pov.lt-20110704072129-mvnzwnl4hye3i2r5

Sync with sprint trunk.

files added:
src/schooltool/basicperson/browser/templates/f_demographic_field_display.pt

src/schooltool/basicperson/browser/templates/f_demographic_field_edit.pt

src/schooltool/basicperson/browser/templates/f_demographics_reorder.pt

src/schooltool/basicperson/browser/templates/f_demographics_view.pt

src/schooltool/person/browser/f_password_form.pt

files renamed:
src/schooltool/skin/flourish/templates/page_expanded.pt => src/schooltool/skin/flourish/templates/page_nosidebar.pt

files modified:
TODO.txt

src/schooltool/app/browser/app.py

src/schooltool/app/browser/templates/f_edit_relationships.pt

src/schooltool/basicperson/browser/demographics.py

src/schooltool/basicperson/browser/flourish.zcml

src/schooltool/basicperson/browser/person.py

src/schooltool/basicperson/browser/templates/f_demographicsViewlet.pt

src/schooltool/contact/browser/basicperson.py

src/schooltool/contact/browser/contact.py

src/schooltool/contact/browser/flourish.zcml

src/schooltool/contact/browser/relationship.py

src/schooltool/contact/browser/templates/f_contact_form.pt

src/schooltool/contact/browser/templates/f_contactsViewlet.pt

src/schooltool/course/browser/templates/f_coursesviewlet.pt

src/schooltool/group/browser/group.py

src/schooltool/person/browser/flourish.zcml

src/schooltool/person/browser/person.py

src/schooltool/report/templates/f_report_link_manager.pt

src/schooltool/skin/flourish/error.py

src/schooltool/skin/flourish/page.py

src/schooltool/skin/flourish/resources/batch.css

src/schooltool/skin/flourish/resources/flourish.css

src/schooltool/skin/flourish/resources/flourish.js

src/schooltool/skin/flourish/resources/form.css

src/schooltool/skin/flourish/resources/jquery-ui.css

src/schooltool/skin/flourish/resources/page.css

src/schooltool/skin/flourish/resources/table.css

src/schooltool/skin/flourish/templates/modal_form_link.pt

src/schooltool/skin/flourish/templates/page.pt

Show diffs side-by-side

added added

removed removed

src/schooltool/app/browser/app.py

src/schooltool/app/browser/templates/f_edit_relationships.pt

src/schooltool/basicperson/browser/demographics.py

src/schooltool/basicperson/browser/flourish.zcml

src/schooltool/basicperson/browser/person.py

src/schooltool/basicperson/browser/templates/f_demographic_field_display.pt

src/schooltool/basicperson/browser/templates/f_demographic_field_edit.pt

src/schooltool/basicperson/browser/templates/f_demographicsViewlet.pt

src/schooltool/basicperson/browser/templates/f_demographics_reorder.pt

src/schooltool/basicperson/browser/templates/f_demographics_view.pt

src/schooltool/contact/browser/basicperson.py

src/schooltool/contact/browser/contact.py

src/schooltool/contact/browser/flourish.zcml

src/schooltool/contact/browser/relationship.py

src/schooltool/contact/browser/templates/f_contact_form.pt

src/schooltool/contact/browser/templates/f_contactsViewlet.pt

src/schooltool/course/browser/templates/f_coursesviewlet.pt

src/schooltool/group/browser/group.py

src/schooltool/person/browser/f_password_form.pt

src/schooltool/person/browser/flourish.zcml

src/schooltool/person/browser/person.py

src/schooltool/report/templates/f_report_link_manager.pt

src/schooltool/skin/flourish/error.py

src/schooltool/skin/flourish/page.py

src/schooltool/skin/flourish/resources/batch.css

src/schooltool/skin/flourish/resources/flourish.css

src/schooltool/skin/flourish/resources/flourish.js

src/schooltool/skin/flourish/resources/form.css

src/schooltool/skin/flourish/resources/jquery-ui.css

src/schooltool/skin/flourish/resources/page.css

src/schooltool/skin/flourish/resources/table.css

src/schooltool/skin/flourish/templates/modal_form_link.pt

src/schooltool/skin/flourish/templates/page.pt

Older »